diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index aa9dacdc..23fb484e 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -1,6 +1,7 @@ name: CI Checks on: + workflow_dispatch: pull_request: push: branches: @@ -174,5 +175,5 @@ jobs: run: npm ci - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }} run: npx semantic-release diff --git a/.gitignore b/.gitignore index e18b6ad3..ae5f179c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ dist *.env # Nostr data folder -.nostr \ No newline at end of file +.nostr + +# Docker Compose overrides +docker-compose.overrides.yml \ No newline at end of file diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 3e58a6b4..cd06011a 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -20,14 +20,31 @@ The following environment variables can be set: | DB_MAX_POOL_SIZE | Max. connections per worker | 32 | | DB_ACQUIRE_CONNECTION_TIMEOUT | New connection timeout (ms) | 60000 | | READ_REPLICA_ENABLED | Read Replica (RR) Toggle | 'false' | -| RR_DB_HOST | PostgresSQL Hostname (RR) | | -| RR_DB_PORT | PostgreSQL Port (RR) | 5432 | -| RR_DB_USER | PostgreSQL Username (RR) | nostr_ts_relay | -| RR_DB_PASSWORD | PostgreSQL Password (RR) | nostr_ts_relay | -| RR_DB_NAME | PostgreSQL Database name (RR) | nostr_ts_relay | -| RR_DB_MIN_POOL_SIZE | Min. connections per worker (RR) | 16 | -| RR_DB_MAX_POOL_SIZE | Max. connections per worker (RR) | 32 | -| RR_DB_ACQUIRE_CONNECTION_TIMEOUT | New connection timeout (ms) (RR) | 60000 | +| READ_REPLICAS | Number of read replicas (RR0, RR1, ..., RRn) | 2 | +| RR0_DB_HOST | PostgresSQL Hostname (RR) | | +| RR0_DB_PORT | PostgreSQL Port (RR) | 5432 | +| RR0_DB_USER | PostgreSQL Username (RR) | nostr_ts_relay | +| RR0_DB_PASSWORD | PostgreSQL Password (RR) | nostr_ts_relay | +| RR0_DB_NAME | PostgreSQL Database name (RR) | nostr_ts_relay | +| RR0_DB_MIN_POOL_SIZE | Min. connections per worker (RR) | 16 | +| RR0_DB_MAX_POOL_SIZE | Max. connections per worker (RR) | 32 | +| RR0_DB_ACQUIRE_CONNECTION_TIMEOUT| New connection timeout (ms) (RR) | 60000 | +| RR1_DB_HOST | PostgresSQL Hostname (RR) | | +| RR1_DB_PORT | PostgreSQL Port (RR) | 5432 | +| RR1_DB_USER | PostgreSQL Username (RR) | nostr_ts_relay | +| RR1_DB_PASSWORD | PostgreSQL Password (RR) | nostr_ts_relay | +| RR1_DB_NAME | PostgreSQL Database name (RR) | nostr_ts_relay | +| RR1_DB_MIN_POOL_SIZE | Min. connections per worker (RR) | 16 | +| RR1_DB_MAX_POOL_SIZE | Max. connections per worker (RR) | 32 | +| RR1_DB_ACQUIRE_CONNECTION_TIMEOUT| New connection timeout (ms) (RR) | 60000 | +| RRn_DB_HOST | PostgresSQL Hostname (RR) | | +| RRn_DB_PORT | PostgreSQL Port (RR) | 5432 | +| RRn_DB_USER | PostgreSQL Username (RR) | nostr_ts_relay | +| RRn_DB_PASSWORD | PostgreSQL Password (RR) | nostr_ts_relay | +| RRn_DB_NAME | PostgreSQL Database name (RR) | nostr_ts_relay | +| RRn_DB_MIN_POOL_SIZE | Min. connections per worker (RR) | 16 | +| RRn_DB_MAX_POOL_SIZE | Max. connections per worker (RR) | 32 | +| RRn_DB_ACQUIRE_CONNECTION_TIMEOUT| New connection timeout (ms) (RR) | 60000 | | TOR_HOST | Tor Hostname | | | TOR_CONTROL_PORT | Tor control Port | 9051 | | TOR_PASSWORD | Tor control password | nostr_ts_relay | @@ -41,9 +58,11 @@ The following environment variables can be set: | DEBUG | Debugging filter | | | ZEBEDEE_API_KEY | Zebedee Project API Key | | +If you've set READ_REPLICAS to 4, you should configure RR0_ through RR3_. + # Settings -Running `nostream` for the first time creates the settings file in `/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `/.nostr` folder exists. The configuration directory can be changed by setting the `NOSTR_CONFIG_DIR` environment variable. +Running `nostream` for the first time creates the settings file in `/.nostr/settings.yaml`. If the file is not created and an error is thrown ensure that the `/.nostr` folder exists. The configuration directory can be changed by setting the `NOSTR_CONFIG_DIR` environment variable. `nostream` will pick up any changes to this settings file without needing to restart. | Name | Description | |---------------------------------------------|-------------------------------------------------------------------------------| @@ -54,8 +73,22 @@ Running `nostream` for the first time creates the settings file in ` nostream logo

- + GitHub release - + GitHub issues - + GitHub stars GitHub top language - + GitHub forks - + GitHub license @@ -27,8 +27,8 @@ Sonarcloud quality gate - - Build status + + Build status

@@ -37,7 +37,7 @@ Typescript. This implementation is production-ready. See below for supported features. -The project master repository is available on [GitHub](https://github.com/Cameri/nostream). +The project master repository is available on [GitHub](https://github.com/cameri/nostream). [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/Xfk5F7?referralCode=Kfv2ly) @@ -57,7 +57,7 @@ NIPs with a relay-specific implementation are listed here. - [x] NIP-16: Event Treatment - [x] NIP-20: Command Results - [x] NIP-22: Event `created_at` Limits -- [x] NIP-26: Delegated Event Signing +- [ ] NIP-26: Delegated Event Signing (REMOVED) - [x] NIP-28: Public Chat - [x] NIP-33: Parameterized Replaceable Events - [x] NIP-40: Expiration Timestamp @@ -83,9 +83,105 @@ Install Docker from their [official guide](https://docs.docker.com/engine/instal ## Full Guide -- [Set up a Paid Nostr relay with Nostream and ZBD](https://andreneves.xyz/p/how-to-setup-a-paid-nostr-relay) by [André Neves](https://snort.social/p/npub1rvg76s0gz535txd9ypg2dfqv0x7a80ar6e096j3v343xdxyrt4ksmkxrck) (CTO & Co-Founder at [ZEBEDEE](https://zebedee.io/)) +- [Set up a Paid Nostr relay with Nostream and ZEBEDEE](https://docs.zebedee.io/docs/guides/nostr-relay) by [André Neves](https://primal.net/andre) (CTO & Co-Founder at [ZEBEDEE](https://zebedee.io/)) - [Set up a Nostr relay in under 5 minutes](https://andreneves.xyz/p/set-up-a-nostr-relay-server-in-under) by [André Neves](https://twitter.com/andreneves) (CTO & Co-Founder at [ZEBEDEE](https://zebedee.io/)) +### Accepting Payments + +1. Before you begin + - Complete one of the Quick Start guides in this document + - Create a `.env` file + - On `.nostr/settings.yaml` file make the following changes: + - Set `payments.enabled` to `true` + - Set `payments.feeSchedules.admission.enabled` to `true` + - Set `limits.event.pubkey.minBalance` to the minimum balance in msats required to accept events (i.e. `1000000` to require a balance of `1000` sats) + - Choose one of the following payment processors: `zebedee`, `nodeless`, `opennode`, `lnbits`, `lnurl` + +2. [ZEBEDEE](https://zebedee.io) + - Complete the step "Before you begin" + - [Sign up for a ZEBEDEE Developer Dashboard account](https://dashboard.zebedee.io/signup), create a new LIVE Project, and get that Project's API Key + - Set `ZEBEDEE_API_KEY` environment variable with the API Key above on your `.env` file + + ``` + ZEBEDEE_API_KEY={YOUR_ZEBEDEE_API_KEY_HERE} + ``` + + - Follow the required steps for all payments processors + - On `.nostr/settings.yaml` file make the following changes: + - `payments.processor` to `zebedee` + - `paymentsProcessors.zebedee.callbackBaseURL` to match your Nostream URL (e.g. `https://{YOUR_DOMAIN_HERE}/callbacks/zebedee`) + - Restart Nostream (`./scripts/stop` followed by `./scripts/start`) + - Read the in-depth guide for more information: [Set Up a Paid Nostr Relay with ZEBEDEE API](https://docs.zebedee.io/docs/guides/nostr-relay) + +3. [Nodeless](https://nodeless.io/?ref=587f477f-ba1c-4bd3-8986-8302c98f6731) + - Complete the step "Before you begin" + - [Sign up](https://nodeless.io/?ref=587f477f-ba1c-4bd3-8986-8302c98f6731) for a new account, create a new store and take note of the store ID + - Go to Profile > API Tokens and generate a new key and take note of it + - Create a store webhook with your Nodeless callback URL (e.g. `https://{YOUR_DOMAIN_HERE}/callbacks/nodeless`) and make sure to enable all of the events. Grab the generated store webhook secret + - Set `NODELESS_API_KEY` and `NODELESS_WEBHOOK_SECRET` environment variables with generated API key and webhook secret, respectively + + ``` + NODELESS_API_KEY={YOUR_NODELESS_API_KEY} + NODELESS_WEBHOOK_SECRET={YOUR_NODELESS_WEBHOOK_SECRET} + ``` + + - On your `.nostr/settings.yaml` file make the following changes: + - Set `payments.processor` to `nodeless` + - Set `paymentsProcessors.nodeless.storeId` to your store ID + - Restart Nostream (`./scripts/stop` followed by `./scripts/start`) + +4. [OpenNode](https://www.opennode.com/) + - Complete the step "Before you begin" + - Sign up for a new account and get verified + - Go to Developers > Integrations and setup two-factor authentication + - Create a new API Key with Invoices permission + - Set `OPENNODE_API_KEY` environment variable on your `.env` file + + ``` + OPENNODE_API_KEY={YOUR_OPENNODE_API_KEY} + ``` + + - On your `.nostr/settings.yaml` file make the following changes: + - Set `payments.processor` to `opennode` + - Restart Nostream (`./scripts/stop` followed by `./scripts/start`) + +5. [LNBITS](https://lnbits.com/) + - Complete the step "Before you begin" + - Create a new wallet on you public LNbits instance + - [Demo](https://legend.lnbits.com/) server must not be used for production + - Your instance must be accessible from the internet and have a valid SSL/TLS certificate + - Get wallet Invoice/read key (in Api docs section of your wallet) + - set `LNBITS_API_KEY` environment variable with the Invoice/read key Key above on your `.env` file + + ``` + LNBITS_API_KEY={YOUR_LNBITS_API_KEY_HERE} + ``` + - On your `.nostr/settings.yaml` file make the following changes: + - Set `payments.processor` to `lnbits` + - set `lnbits.baseURL` to your LNbits instance URL (e.g. `https://{YOUR_LNBITS_DOMAIN_HERE}/`) + - Set `paymentsProcessors.lnbits.callbackBaseURL` to match your Nostream URL (e.g. `https://{YOUR_DOMAIN_HERE}/callbacks/lnbits`) + - Restart Nostream (`./scripts/stop` followed by `./scripts/start`) + +6. [Alby](https://getalby.com/) or any LNURL Provider with [LNURL-verify](https://github.com/lnurl/luds/issues/182) support + - Complete the step "Before you begin" + - [Create a new account](https://getalby.com/user/new) if you don't have an LNURL + - On your `.nostr/settings.yaml` file make the following changes: + - Set `payments.processor` to `lnurl` + - Set `lnurl.invoiceURL` to your LNURL (e.g. `https://getalby.com/lnurlp/your-username`) + - Restart Nostream (`./scripts/stop` followed by `./scripts/start`) + +7. Ensure payments are required for your public key + - Visit https://{YOUR-DOMAIN}/ + - You should be presented with a form requesting an admission fee to be paid + - Fill out the form and take the necessary steps to pay the invoice + - Wait until the screen indicates that payment was received + - Add your relay URL to your favorite Nostr client (wss://{YOUR-DOMAIN}) and wait for it to connect + - Send a couple notes to test + - Go to https://websocketking.com/ and connect to your relay (wss://{YOUR_DOMAIN}) + - Convert your npub to hexadecimal using a [Key Converter](https://damus.io/key/) + - Send the following JSON message: `["REQ", "payment-test", {"authors":["your-pubkey-in-hexadecimal"]}]` + - You should get back the few notes you sent earlier + ## Quick Start (Docker Compose) Install Docker following the [official guide](https://docs.docker.com/engine/install/). @@ -97,6 +193,14 @@ Clone repository and enter directory: cd nostream ``` +Generate a secret with: `openssl rand -hex 128` +Copy the output and paste it into an `.env` file: + + ``` + SECRET=aaabbbccc...dddeeefff + # Secret shortened for brevity + ``` + Start: ``` ./scripts/start @@ -185,18 +289,15 @@ Set the following environment variables: REDIS_PASSWORD=nostr_ts_relay ``` -If enabling payments, generate a long random secret and set SECRET: - You may want to use `openssl rand -hex 128` to generate a secret. +Generate a long random secret and set SECRET: +You may want to use `openssl rand -hex 128` to generate a secret. ``` SECRET=aaabbbccc...dddeeefff # Secret shortened for brevity ``` -In addition, if using Zebedee for payments, you must also set ZEBEDEE_API_KEY with -an API Key from one of your projects in your Zebedee Developer Dashboard. Contact -@foxp2zeb on Telegram or npub1rvg76s0gz535txd9ypg2dfqv0x7a80ar6e096j3v343xdxyrt4ksmkxrck on Nostr requesting -access to the Zebedee Developer Dashboard. +### Initializing the database Create `nostr_ts_relay` database: diff --git a/docker-compose.yml b/docker-compose.yml index 0e236225..b7cacded 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ services: build: . container_name: nostream environment: + SECRET: ${SECRET} RELAY_PORT: 8008 # Master NOSTR_CONFIG_DIR: /home/node/.nostr @@ -15,15 +16,27 @@ services: DB_MAX_POOL_SIZE: 64 DB_ACQUIRE_CONNECTION_TIMEOUT: 60000 # Read Replica + READ_REPLICAS: 2 READ_REPLICA_ENABLED: 'false' - RR_DB_HOST: db - RR_DB_PORT: 5432 - RR_DB_USER: nostr_ts_relay - RR_DB_PASSWORD: nostr_ts_relay - RR_DB_NAME: nostr_ts_relay - RR_DB_MIN_POOL_SIZE: 16 - RR_DB_MAX_POOL_SIZE: 64 - RR_DB_ACQUIRE_CONNECTION_TIMEOUT: 10000 + # Read Replica No. 1 + RR0_DB_HOST: db + RR0_DB_PORT: 5432 + RR0_DB_USER: nostr_ts_relay + RR0_DB_PASSWORD: nostr_ts_relay + RR0_DB_NAME: nostr_ts_relay + RR0_DB_MIN_POOL_SIZE: 16 + RR0_DB_MAX_POOL_SIZE: 64 + RR0_DB_ACQUIRE_CONNECTION_TIMEOUT: 10000 + # Read Replica No. 2 + RR1_DB_HOST: db + RR1_DB_PORT: 5432 + RR1_DB_USER: nostr_ts_relay + RR1_DB_PASSWORD: nostr_ts_relay + RR1_DB_NAME: nostr_ts_relay + RR1_DB_MIN_POOL_SIZE: 16 + RR1_DB_MAX_POOL_SIZE: 64 + RR1_DB_ACQUIRE_CONNECTION_TIMEOUT: 10000 + # Add RR2, RR3, etc. to configure more read replicas # Redis REDIS_HOST: nostream-cache REDIS_PORT: 6379 @@ -33,6 +46,16 @@ services: TOR_CONTROL_PORT: 9051 TOR_PASSWORD: nostr_ts_relay HIDDEN_SERVICE_PORT: 80 + # Payments Processors + # Zebedee + ZEBEDEE_API_KEY: ${ZEBEDEE_API_KEY} + # Nodeless.io + NODELESS_API_KEY: ${NODELESS_API_KEY} + NODELESS_WEBHOOK_SECRET: ${NODELESS_WEBHOOK_SECRET} + # OpenNode + OPENNODE_API_KEY: ${OPENNODE_API_KEY} + # Lnbits + LNBITS_API_KEY: ${LNBITS_API_KEY} # Enable DEBUG for troubleshooting. Examples: # DEBUG: "primary:*" # DEBUG: "worker:*" @@ -52,6 +75,7 @@ services: restart: on-failure networks: default: + nostream-db: image: postgres container_name: nostream-db @@ -73,6 +97,7 @@ services: timeout: 5s retries: 5 start_period: 360s + nostream-cache: image: redis:7.0.5-alpine3.16 container_name: nostream-cache @@ -87,6 +112,7 @@ services: interval: 1s timeout: 5s retries: 5 + nostream-migrate: image: node:18-alpine3.16 container_name: nostream-migrate @@ -108,7 +134,6 @@ services: condition: service_healthy networks: default: - ipv4_address: 10.10.10.254 networks: default: diff --git a/migrations/20230213103904_add_verify_url_to_invoices_table.js b/migrations/20230213103904_add_verify_url_to_invoices_table.js new file mode 100644 index 00000000..7ed03bf7 --- /dev/null +++ b/migrations/20230213103904_add_verify_url_to_invoices_table.js @@ -0,0 +1,9 @@ +exports.up = function (knex) { + return knex.raw('ALTER TABLE invoices ADD verify_url TEXT;') +} + +exports.down = function (knex) { + return knex.schema.alterTable('invoices', function (table) { + table.dropColumn('verify_url') + }) +} diff --git a/migrations/20240108_130100_add_event_tags_table.js b/migrations/20240108_130100_add_event_tags_table.js new file mode 100644 index 00000000..2c57180a --- /dev/null +++ b/migrations/20240108_130100_add_event_tags_table.js @@ -0,0 +1,87 @@ +exports.up = async function (knex) { + // Create the event_tags table + await knex.schema.createTable('event_tags', function (table) { + table.uuid('id').primary().defaultTo(knex.raw('uuid_generate_v4()')) + table.binary('event_id').notNullable() + table.text('tag_name').notNullable() + table.text('tag_value').notNullable() + }) + + // Add indexes + await knex.schema.table('event_tags', function (table) { + table.index('event_id') + table.index(['tag_name', 'tag_value']) + }) + + // Add triggers + await knex.raw( + `CREATE OR REPLACE FUNCTION process_event_tags() RETURNS TRIGGER AS $$ + DECLARE + tag_element jsonb; + tag_name text; + tag_value text; + BEGIN + DELETE FROM event_tags WHERE event_id = OLD.event_id; + + IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE' THEN + FOR tag_element IN SELECT jsonb_array_elements(NEW.event_tags) + LOOP + tag_name := trim((tag_element->0)::text, '"'); + tag_value := trim((tag_element->1)::text, '"'); + IF length(tag_name) = 1 AND tag_value IS NOT NULL AND tag_value <> '' THEN + INSERT INTO event_tags (event_id, tag_name, tag_value) VALUES (NEW.event_id, tag_name, tag_value); + END IF; + END LOOP; + END IF; + + RETURN NEW; + END; + $$ LANGUAGE plpgsql; + + CREATE TRIGGER insert_event_tags + AFTER INSERT OR UPDATE OR DELETE ON events + FOR EACH ROW + EXECUTE FUNCTION process_event_tags(); + `) + + // Migrate jsonb event_tags to event_tags table + const events = await knex.select('event_id', 'event_tags').from('events') + const totalEvents = events.length + let processedEvents = 0 + let lastPercentage = 0 + + for (const event of events) { + const exists = await knex('event_tags').where('event_id', event.event_id).first() + if (exists) { + continue + } + + for (const tag of event.event_tags) { + const [tag_name, tag_value] = tag + if (tag_name.length === 1 && tag_value) { + await knex('event_tags').insert({ + event_id: event.event_id, + tag_name: tag_name, + tag_value: tag_value, + }) + } + } + + processedEvents++ + const currentPercentage = Math.floor(processedEvents / totalEvents * 100) + if (currentPercentage > lastPercentage) { + console.log(`${new Date().toLocaleString()} Migration progress: ${currentPercentage}% (${processedEvents}/${totalEvents})`) + lastPercentage = currentPercentage + } + } +} + +exports.down = function (knex) { + return knex.schema + // Drop the trigger first + .raw('DROP TRIGGER IF EXISTS insert_event_tags ON events') + // Then drop the function + .raw('DROP FUNCTION IF EXISTS process_event_tags') + // Finally, drop the table + .dropTable('event_tags') +} diff --git a/migrations/20240111204900_remove_delegator_from_events_table.js b/migrations/20240111204900_remove_delegator_from_events_table.js new file mode 100644 index 00000000..b5a7310c --- /dev/null +++ b/migrations/20240111204900_remove_delegator_from_events_table.js @@ -0,0 +1,18 @@ +exports.up = async function (knex) { + await knex.schema + .raw('DROP INDEX IF EXISTS pubkey_delegator_kind_idx;') + await knex.schema.alterTable('events', function (table) { + table.dropColumn('event_delegator') + }) +} + +exports.down = async function (knex) { + await knex.schema.alterTable('events', function (table) { + table.binary('event_delegator').nullable().index() + }) + await knex.schema + .raw( + `CREATE UNIQUE INDEX pubkey_delegator_kind_idx + ON events ( event_pubkey, event_delegator, event_kind );`, + ) +} diff --git a/package-lock.json b/package-lock.json index d02a8fb4..5dfe8626 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "nostream", - "version": "1.22.6", + "version": "2.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nostream", - "version": "1.22.6", + "version": "2.1.0", "license": "MIT", "dependencies": { "@noble/secp256k1": "1.7.1", - "axios": "1.2.6", + "axios": "^1.7.7", "bech32": "2.0.0", "body-parser": "1.20.1", "debug": "4.3.4", @@ -27,12 +27,12 @@ "redis": "4.5.1", "rxjs": "7.8.0", "tor-control-ts": "^1.0.0", - "ws": "8.12.0" + "ws": "^8.18.0" }, "devDependencies": { "@commitlint/cli": "17.2.0", "@commitlint/config-conventional": "17.2.0", - "@cucumber/cucumber": "8.7.0", + "@cucumber/cucumber": "10.2.1", "@cucumber/pretty-formatter": "1.0.0", "@semantic-release/commit-analyzer": "9.0.2", "@semantic-release/git": "10.0.1", @@ -50,7 +50,7 @@ "@types/ramda": "^0.28.13", "@types/sinon": "^10.0.11", "@types/sinon-chai": "^3.2.8", - "@types/ws": "^8.5.3", + "@types/ws": "^8.5.12", "@typescript-eslint/eslint-plugin": "^5.19.0", "@typescript-eslint/parser": "^5.19.0", "chai": "^4.3.6", @@ -88,17 +88,89 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { "version": "7.18.8", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz", @@ -148,13 +220,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.18.12", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz", - "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.10", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { @@ -203,34 +276,34 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "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==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", - "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", + "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==", "dev": true, "dependencies": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -280,30 +353,30 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" @@ -333,13 +406,13 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -418,9 +491,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.11", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz", - "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", + "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -429,47 +502,35 @@ "node": ">=6.0.0" } }, - "node_modules/@babel/runtime": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz", - "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==", - "dev": true, - "dependencies": { - "regenerator-runtime": "^0.13.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.18.11", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz", - "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.10", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.11", - "@babel/types": "^7.18.10", - "debug": "^4.1.0", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", + "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@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.22.6", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -486,13 +547,13 @@ } }, "node_modules/@babel/types": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", - "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -868,37 +929,35 @@ } }, "node_modules/@cucumber/ci-environment": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-9.1.0.tgz", - "integrity": "sha512-jdnF6APXP3GawMue8kdMxhu6TBhyRUO4KDRxTowf06NtclLjIw2Ybpo9IcIOMvE8kHukvJyM00uxWX+CfS7JgQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-10.0.0.tgz", + "integrity": "sha512-lRkiehckosIOdc7p1L44nZsttO5dVHFjpwKKWZ07x8SeoAdV/sPuGe1PISe0AmAowFGza62nMOgG4KaroGzwFQ==", "dev": true }, "node_modules/@cucumber/cucumber": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-8.7.0.tgz", - "integrity": "sha512-RYhobk+W73UVhd7fRHiKsAchjMl1h3Ic5VSSPwY6KyKw8t0wsfZM+U/a0xcUO/xflABeA0A8J+PupTNB4z9O3Q==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-10.2.1.tgz", + "integrity": "sha512-jpJPhngRDHkPkTYQ4dtDHM30dhyM7OJJTMqp0ZoImeX2t7zwlVErfhPD5NlVnXL2yor6AJG6QFe/GwwI7IXc2w==", "dev": true, "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@cucumber/ci-environment": "9.1.0", - "@cucumber/cucumber-expressions": "16.0.0", - "@cucumber/gherkin": "24.0.0", + "@cucumber/ci-environment": "10.0.0", + "@cucumber/cucumber-expressions": "17.0.1", + "@cucumber/gherkin": "27.0.0", "@cucumber/gherkin-streams": "5.0.1", - "@cucumber/gherkin-utils": "8.0.0", - "@cucumber/html-formatter": "20.1.0", + "@cucumber/gherkin-utils": "8.0.5", + "@cucumber/html-formatter": "21.2.0", "@cucumber/message-streams": "4.0.1", - "@cucumber/messages": "19.1.4", - "@cucumber/tag-expressions": "4.1.0", + "@cucumber/messages": "24.0.1", + "@cucumber/tag-expressions": "6.0.0", "assertion-error-formatter": "^3.0.0", "capital-case": "^1.0.4", "chalk": "^4.1.2", "cli-table3": "0.6.3", - "commander": "^9.0.0", + "commander": "^10.0.0", "debug": "^4.3.4", - "duration": "^0.2.2", - "durations": "^3.4.2", + "error-stack-parser": "^2.1.4", "figures": "^3.2.0", - "glob": "^7.1.6", + "glob": "^10.3.10", "has-ansi": "^4.0.1", "indent-string": "^4.0.0", "is-installed-globally": "^0.4.0", @@ -906,35 +965,176 @@ "knuth-shuffle-seeded": "^1.0.6", "lodash.merge": "^4.6.2", "lodash.mergewith": "^4.6.2", + "luxon": "3.2.1", + "mkdirp": "^2.1.5", "mz": "^2.7.0", "progress": "^2.0.3", + "read-pkg-up": "^7.0.1", "resolve-pkg": "^2.0.0", - "semver": "7.3.7", - "stack-chain": "^2.0.0", - "string-argv": "^0.3.1", + "semver": "7.5.3", + "string-argv": "0.3.1", "strip-ansi": "6.0.1", "supports-color": "^8.1.1", "tmp": "^0.2.1", + "type-fest": "^4.8.3", "util-arity": "^1.1.0", - "verror": "^1.10.0", - "yup": "^0.32.11" + "xmlbuilder": "^15.1.1", + "yaml": "^2.2.2", + "yup": "1.2.0" }, "bin": { "cucumber-js": "bin/cucumber.js" }, "engines": { - "node": "12 || 14 || >=16" + "node": "18 || >=20" } }, "node_modules/@cucumber/cucumber-expressions": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-16.0.0.tgz", - "integrity": "sha512-HTh+Pg7oQ5aLuCkSbD2Q6jBaE40M3R/XaLEz+UqD5d9dZRu6P38W4LTooV5bV6dZgBunlMLK8+6ug2ziYvRddw==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-17.0.1.tgz", + "integrity": "sha512-reR7/sNRmDWgdz8BtFuHEwpksPnAkHty7gxUC2n0iaUPmckv9G5I5i+Vonc6xwUHDb/hmHPz/DyUL+Iv4Ao96w==", "dev": true, "dependencies": { "regexp-match-indices": "1.0.2" } }, + "node_modules/@cucumber/cucumber/node_modules/@cucumber/messages": { + "version": "24.0.1", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-24.0.1.tgz", + "integrity": "sha512-dKfNkvgc6stSQIyeHk7p/221iqEZe1BP+e/Js8XKtSmc0sS8khKMvbSBwYVeonn/67/vYKiAyo6Eo0SzXd5Plw==", + "dev": true, + "dependencies": { + "@types/uuid": "9.0.7", + "class-transformer": "0.5.1", + "reflect-metadata": "0.2.1", + "uuid": "9.0.1" + } + }, + "node_modules/@cucumber/cucumber/node_modules/@types/uuid": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz", + "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==", + "dev": true + }, + "node_modules/@cucumber/cucumber/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@cucumber/cucumber/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@cucumber/cucumber/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==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@cucumber/cucumber/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@cucumber/cucumber/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@cucumber/cucumber/node_modules/mkdirp": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz", + "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==", + "dev": true, + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@cucumber/cucumber/node_modules/reflect-metadata": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz", + "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==", + "dev": true + }, + "node_modules/@cucumber/cucumber/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@cucumber/cucumber/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@cucumber/cucumber/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -950,13 +1150,47 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/@cucumber/cucumber/node_modules/type-fest": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.9.0.tgz", + "integrity": "sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@cucumber/cucumber/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@cucumber/cucumber/node_modules/yaml": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, "node_modules/@cucumber/gherkin": { - "version": "24.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-24.0.0.tgz", - "integrity": "sha512-b7OsnvX1B8myDAKMc+RAiUX9bzgtNdjGsiMj10O13xu2HBWIOQ19EqBJ4xLO5CFG/lGk1J/+L0lANQVowxLVBg==", + "version": "27.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-27.0.0.tgz", + "integrity": "sha512-j5rCsjqzRiC3iVTier3sa0kzyNbkcAmF7xr7jKnyO7qDeK3Z8Ye1P3KSVpeQRMY+KCDJ3WbTDdyxH0FwfA/fIw==", "dev": true, "dependencies": { - "@cucumber/messages": "^19.0.0" + "@cucumber/messages": ">=19.1.4 <=22" } }, "node_modules/@cucumber/gherkin-streams": { @@ -987,23 +1221,43 @@ } }, "node_modules/@cucumber/gherkin-utils": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.0.tgz", - "integrity": "sha512-8uIZInEe3cO1cASmy3BA0PbVFUI+xWBnZAxmICbVOPsZaMB85MtESZLafzErgfRQPsHf6uYbVagP7MIjNPM5Jw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.5.tgz", + "integrity": "sha512-kxM1OCDjYddF26VKc892PF0GokW4wUIl1PUz3TIXsPZgS39ExM1pF8oww8mlGFD2B0+4op/cSE3SSIME5H3aNw==", "dev": true, "dependencies": { - "@cucumber/messages": "^19.0.0", - "@teppeis/multimaps": "2.0.0", - "commander": "9.3.0" + "@cucumber/gherkin": "^26.0.0", + "@cucumber/messages": "^22.0.0", + "@teppeis/multimaps": "3.0.0", + "commander": "10.0.1", + "source-map-support": "^0.5.21" }, "bin": { "gherkin-utils": "bin/gherkin-utils" } }, + "node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/gherkin": { + "version": "26.2.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-26.2.0.tgz", + "integrity": "sha512-iRSiK8YAIHAmLrn/mUfpAx7OXZ7LyNlh1zT89RoziSVCbqSVDxJS6ckEzW8loxs+EEXl0dKPQOXiDmbHV+C/fA==", + "dev": true, + "dependencies": { + "@cucumber/messages": ">=19.1.4 <=22" + } + }, + "node_modules/@cucumber/gherkin-utils/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@cucumber/html-formatter": { - "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-20.1.0.tgz", - "integrity": "sha512-bu2shjZuVGfAtKaw8ebCBxhgu3Eiaz/P7ZuSxrw9YCa6rOyxMX5zO+4f2FUBTK/AV0b9O5cAB/xitYBrGhlYKg==", + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-21.2.0.tgz", + "integrity": "sha512-4OcSa12Y0v5e4ySDl67+QFTxCG/Y9fxGSkFqvm98ggpTvS7b75whwzupu+lM2lMBw+h3H6P8ZURQr0xQIAwE2A==", "dev": true, "peerDependencies": { "@cucumber/messages": ">=18" @@ -1019,12 +1273,12 @@ } }, "node_modules/@cucumber/messages": { - "version": "19.1.4", - "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-19.1.4.tgz", - "integrity": "sha512-Pksl0pnDz2l1+L5Ug85NlG6LWrrklN9qkMxN5Mv+1XZ3T6u580dnE6mVaxjJRdcOq4tR17Pc0RqIDZMyVY1FlA==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz", + "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==", "dev": true, "dependencies": { - "@types/uuid": "8.3.4", + "@types/uuid": "9.0.1", "class-transformer": "0.5.1", "reflect-metadata": "0.1.13", "uuid": "9.0.0" @@ -1068,9 +1322,9 @@ } }, "node_modules/@cucumber/tag-expressions": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-4.1.0.tgz", - "integrity": "sha512-chTnjxV3vryL75N90wJIMdMafXmZoO2JgNJLYpsfcALL2/IQrRiny3vM9DgD5RDCSt1LNloMtb7rGey9YWxCsA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-6.0.0.tgz", + "integrity": "sha512-JbNb/254Wn6b8cfrIJoqR0NekHXvoB/eMvSY4RK11H8k+YZfm7mZesu/3yVX67nkW+Y+PGjZFcgTMcfjwFRsRw==", "dev": true }, "node_modules/@dinero.js/calculator-number": { @@ -1147,6 +1401,102 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1302,13 +1652,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@noble/secp256k1": { @@ -1516,6 +1866,16 @@ "@octokit/openapi-types": "^14.0.0" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@redis/bloom": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz", @@ -1757,12 +2117,12 @@ "dev": true }, "node_modules/@teppeis/multimaps": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-2.0.0.tgz", - "integrity": "sha512-TL1adzq1HdxUf9WYduLcQ/DNGYiz71U31QRgbnr0Ef1cPyOUOsBojxHVWpFeOSUucB6Lrs0LxFRA14ntgtkc9w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-3.0.0.tgz", + "integrity": "sha512-ID7fosbc50TbT0MK0EG12O+gAP3W3Aa/Pz4DaTtQtEvlc9Odaqi0de+xuZ7Li2GtK4HzEX7IuRWS/JmZLksR3Q==", "dev": true, "engines": { - "node": ">=10.17" + "node": ">=14" } }, "node_modules/@tootallnate/once": { @@ -1876,12 +2236,6 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, - "node_modules/@types/lodash": { - "version": "4.14.186", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz", - "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==", - "dev": true - }, "node_modules/@types/mdast": { "version": "3.0.10", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", @@ -2025,15 +2379,15 @@ "dev": true }, "node_modules/@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==", "dev": true }, "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", + "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "dev": true, "dependencies": { "@types/node": "*" @@ -2514,15 +2868,6 @@ "node": ">=0.10.0" } }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, "node_modules/assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -2564,11 +2909,11 @@ } }, "node_modules/axios": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", - "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -3741,16 +4086,6 @@ "node": ">=4" } }, - "node_modules/d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "dev": true, - "dependencies": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "node_modules/dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", @@ -4055,25 +4390,6 @@ "readable-stream": "^2.0.2" } }, - "node_modules/duration": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz", - "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==", - "dev": true, - "dependencies": { - "d": "1", - "es5-ext": "~0.10.46" - } - }, - "node_modules/durations": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/durations/-/durations-3.4.2.tgz", - "integrity": "sha512-V/lf7y33dGaypZZetVI1eu7BmvkbC4dItq12OElLRpKuaU5JxQstV2zHwLv8P7cNbQ+KL1WD80zMCTx5dNC4dg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/dynamic-dedupe": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", @@ -4083,6 +4399,12 @@ "xtend": "^4.0.0" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -4140,19 +4462,13 @@ "is-arrayish": "^0.2.1" } }, - "node_modules/es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", "dev": true, - "hasInstallScript": true, "dependencies": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" - }, - "engines": { - "node": ">=0.10" + "stackframe": "^1.3.4" } }, "node_modules/es6-error": { @@ -4161,27 +4477,6 @@ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", "dev": true }, - "node_modules/es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "dev": true, - "dependencies": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "dev": true, - "dependencies": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -4527,21 +4822,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, - "node_modules/ext": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", - "dev": true, - "dependencies": { - "type": "^2.7.2" - } - }, - "node_modules/ext/node_modules/type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", - "dev": true - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -4574,15 +4854,6 @@ "node": ">=0.6.0" } }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4824,9 +5095,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -6109,6 +6380,24 @@ "node": ">=8" } }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/java-properties": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz", @@ -6399,12 +6688,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "node_modules/lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "dev": true - }, "node_modules/lodash.capitalize": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", @@ -6586,6 +6869,15 @@ "node": ">=10" } }, + "node_modules/luxon": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", + "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -6901,6 +7193,15 @@ "node": ">=0.10.0" } }, + "node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -7141,12 +7442,6 @@ "thenify-all": "^1.0.0" } }, - "node_modules/nanoclone": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", - "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==", - "dev": true - }, "node_modules/nanoid": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", @@ -7185,12 +7480,6 @@ "integrity": "sha512-EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g==", "dev": true }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", - "dev": true - }, "node_modules/nise": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz", @@ -10439,6 +10728,31 @@ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-to-regexp": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", @@ -10813,9 +11127,9 @@ } }, "node_modules/property-expr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz", - "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz", + "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==", "dev": true }, "node_modules/protocols": { @@ -11250,12 +11564,6 @@ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", "dev": true }, - "node_modules/regenerator-runtime": { - "version": "0.13.10", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", - "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==", - "dev": true - }, "node_modules/regexp-match-indices": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regexp-match-indices/-/regexp-match-indices-1.0.2.tgz", @@ -11266,9 +11574,9 @@ } }, "node_modules/regexp-tree": { - "version": "0.1.24", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz", - "integrity": "sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==", + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", + "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", "dev": true, "bin": { "regexp-tree": "bin/regexp-tree" @@ -12082,10 +12390,10 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, - "node_modules/stack-chain": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz", - "integrity": "sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg==", + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", "dev": true }, "node_modules/statuses": { @@ -12144,6 +12452,21 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -12156,6 +12479,19 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -12414,6 +12750,12 @@ "node": ">=8" } }, + "node_modules/tiny-case": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz", + "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==", + "dev": true + }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -12681,12 +13023,6 @@ "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/type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", - "dev": true - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -12957,20 +13293,6 @@ "node": ">= 0.8" } }, - "node_modules/verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/vfile": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", @@ -13048,9 +13370,9 @@ "dev": true }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -13085,6 +13407,24 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -13104,9 +13444,9 @@ } }, "node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "engines": { "node": ">=10.0.0" }, @@ -13123,6 +13463,15 @@ } } }, + "node_modules/xmlbuilder": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true, + "engines": { + "node": ">=8.0" + } + }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -13218,21 +13567,27 @@ } }, "node_modules/yup": { - "version": "0.32.11", - "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz", - "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-1.2.0.tgz", + "integrity": "sha512-PPqYKSAXjpRCgLgLKVGPA33v5c/WgEx3wi6NFjIiegz90zSwyMpvTFp/uGcVnnbx6to28pgnzp/q8ih3QRjLMQ==", "dev": true, "dependencies": { - "@babel/runtime": "^7.15.4", - "@types/lodash": "^4.14.175", - "lodash": "^4.17.21", - "lodash-es": "^4.17.21", - "nanoclone": "^0.2.1", - "property-expr": "^2.0.4", - "toposort": "^2.0.2" - }, + "property-expr": "^2.0.5", + "tiny-case": "^1.0.3", + "toposort": "^2.0.2", + "type-fest": "^2.19.0" + } + }, + "node_modules/yup/node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true, "engines": { - "node": ">=10" + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/zip-stream": { @@ -13276,12 +13631,71 @@ } }, "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "requires": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "@babel/compat-data": { @@ -13322,13 +13736,14 @@ } }, "@babel/generator": { - "version": "7.18.12", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz", - "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "requires": { - "@babel/types": "^7.18.10", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "dependencies": { @@ -13366,28 +13781,28 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "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==", "dev": true }, "@babel/helper-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", - "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", + "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==", "dev": true, "requires": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" } }, "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-module-imports": { @@ -13425,24 +13840,24 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/helper-validator-option": { @@ -13463,13 +13878,13 @@ } }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "dependencies": { @@ -13531,47 +13946,38 @@ } } }, - "@babel/parser": { - "version": "7.18.11", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz", - "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==", - "dev": true - }, - "@babel/runtime": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz", - "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.4" - } + "@babel/parser": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", + "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", + "dev": true }, "@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } }, "@babel/traverse": { - "version": "7.18.11", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz", - "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.10", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.11", - "@babel/types": "^7.18.10", - "debug": "^4.1.0", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", + "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@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.22.6", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "dependencies": { @@ -13584,13 +13990,13 @@ } }, "@babel/types": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", - "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, @@ -13891,37 +14297,35 @@ } }, "@cucumber/ci-environment": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-9.1.0.tgz", - "integrity": "sha512-jdnF6APXP3GawMue8kdMxhu6TBhyRUO4KDRxTowf06NtclLjIw2Ybpo9IcIOMvE8kHukvJyM00uxWX+CfS7JgQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/ci-environment/-/ci-environment-10.0.0.tgz", + "integrity": "sha512-lRkiehckosIOdc7p1L44nZsttO5dVHFjpwKKWZ07x8SeoAdV/sPuGe1PISe0AmAowFGza62nMOgG4KaroGzwFQ==", "dev": true }, "@cucumber/cucumber": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-8.7.0.tgz", - "integrity": "sha512-RYhobk+W73UVhd7fRHiKsAchjMl1h3Ic5VSSPwY6KyKw8t0wsfZM+U/a0xcUO/xflABeA0A8J+PupTNB4z9O3Q==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber/-/cucumber-10.2.1.tgz", + "integrity": "sha512-jpJPhngRDHkPkTYQ4dtDHM30dhyM7OJJTMqp0ZoImeX2t7zwlVErfhPD5NlVnXL2yor6AJG6QFe/GwwI7IXc2w==", "dev": true, "requires": { - "@cspotcode/source-map-support": "^0.8.0", - "@cucumber/ci-environment": "9.1.0", - "@cucumber/cucumber-expressions": "16.0.0", - "@cucumber/gherkin": "24.0.0", + "@cucumber/ci-environment": "10.0.0", + "@cucumber/cucumber-expressions": "17.0.1", + "@cucumber/gherkin": "27.0.0", "@cucumber/gherkin-streams": "5.0.1", - "@cucumber/gherkin-utils": "8.0.0", - "@cucumber/html-formatter": "20.1.0", + "@cucumber/gherkin-utils": "8.0.5", + "@cucumber/html-formatter": "21.2.0", "@cucumber/message-streams": "4.0.1", - "@cucumber/messages": "19.1.4", - "@cucumber/tag-expressions": "4.1.0", + "@cucumber/messages": "24.0.1", + "@cucumber/tag-expressions": "6.0.0", "assertion-error-formatter": "^3.0.0", "capital-case": "^1.0.4", "chalk": "^4.1.2", "cli-table3": "0.6.3", - "commander": "^9.0.0", + "commander": "^10.0.0", "debug": "^4.3.4", - "duration": "^0.2.2", - "durations": "^3.4.2", + "error-stack-parser": "^2.1.4", "figures": "^3.2.0", - "glob": "^7.1.6", + "glob": "^10.3.10", "has-ansi": "^4.0.1", "indent-string": "^4.0.0", "is-installed-globally": "^0.4.0", @@ -13929,20 +14333,116 @@ "knuth-shuffle-seeded": "^1.0.6", "lodash.merge": "^4.6.2", "lodash.mergewith": "^4.6.2", + "luxon": "3.2.1", + "mkdirp": "^2.1.5", "mz": "^2.7.0", "progress": "^2.0.3", + "read-pkg-up": "^7.0.1", "resolve-pkg": "^2.0.0", - "semver": "7.3.7", - "stack-chain": "^2.0.0", - "string-argv": "^0.3.1", + "semver": "7.5.3", + "string-argv": "0.3.1", "strip-ansi": "6.0.1", "supports-color": "^8.1.1", "tmp": "^0.2.1", + "type-fest": "^4.8.3", "util-arity": "^1.1.0", - "verror": "^1.10.0", - "yup": "^0.32.11" + "xmlbuilder": "^15.1.1", + "yaml": "^2.2.2", + "yup": "1.2.0" }, "dependencies": { + "@cucumber/messages": { + "version": "24.0.1", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-24.0.1.tgz", + "integrity": "sha512-dKfNkvgc6stSQIyeHk7p/221iqEZe1BP+e/Js8XKtSmc0sS8khKMvbSBwYVeonn/67/vYKiAyo6Eo0SzXd5Plw==", + "dev": true, + "requires": { + "@types/uuid": "9.0.7", + "class-transformer": "0.5.1", + "reflect-metadata": "0.2.1", + "uuid": "9.0.1" + } + }, + "@types/uuid": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz", + "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==", + "dev": true + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true + }, + "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==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + } + }, + "glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + } + }, + "minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "mkdirp": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz", + "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==", + "dev": true + }, + "reflect-metadata": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz", + "integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==", + "dev": true + }, + "semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true + }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -13951,25 +14451,43 @@ "requires": { "has-flag": "^4.0.0" } + }, + "type-fest": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.9.0.tgz", + "integrity": "sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==", + "dev": true + }, + "uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "dev": true + }, + "yaml": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "dev": true } } }, "@cucumber/cucumber-expressions": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-16.0.0.tgz", - "integrity": "sha512-HTh+Pg7oQ5aLuCkSbD2Q6jBaE40M3R/XaLEz+UqD5d9dZRu6P38W4LTooV5bV6dZgBunlMLK8+6ug2ziYvRddw==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-17.0.1.tgz", + "integrity": "sha512-reR7/sNRmDWgdz8BtFuHEwpksPnAkHty7gxUC2n0iaUPmckv9G5I5i+Vonc6xwUHDb/hmHPz/DyUL+Iv4Ao96w==", "dev": true, "requires": { "regexp-match-indices": "1.0.2" } }, "@cucumber/gherkin": { - "version": "24.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-24.0.0.tgz", - "integrity": "sha512-b7OsnvX1B8myDAKMc+RAiUX9bzgtNdjGsiMj10O13xu2HBWIOQ19EqBJ4xLO5CFG/lGk1J/+L0lANQVowxLVBg==", + "version": "27.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-27.0.0.tgz", + "integrity": "sha512-j5rCsjqzRiC3iVTier3sa0kzyNbkcAmF7xr7jKnyO7qDeK3Z8Ye1P3KSVpeQRMY+KCDJ3WbTDdyxH0FwfA/fIw==", "dev": true, "requires": { - "@cucumber/messages": "^19.0.0" + "@cucumber/messages": ">=19.1.4 <=22" } }, "@cucumber/gherkin-streams": { @@ -13991,20 +14509,39 @@ } }, "@cucumber/gherkin-utils": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.0.tgz", - "integrity": "sha512-8uIZInEe3cO1cASmy3BA0PbVFUI+xWBnZAxmICbVOPsZaMB85MtESZLafzErgfRQPsHf6uYbVagP7MIjNPM5Jw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin-utils/-/gherkin-utils-8.0.5.tgz", + "integrity": "sha512-kxM1OCDjYddF26VKc892PF0GokW4wUIl1PUz3TIXsPZgS39ExM1pF8oww8mlGFD2B0+4op/cSE3SSIME5H3aNw==", "dev": true, "requires": { - "@cucumber/messages": "^19.0.0", - "@teppeis/multimaps": "2.0.0", - "commander": "9.3.0" + "@cucumber/gherkin": "^26.0.0", + "@cucumber/messages": "^22.0.0", + "@teppeis/multimaps": "3.0.0", + "commander": "10.0.1", + "source-map-support": "^0.5.21" + }, + "dependencies": { + "@cucumber/gherkin": { + "version": "26.2.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-26.2.0.tgz", + "integrity": "sha512-iRSiK8YAIHAmLrn/mUfpAx7OXZ7LyNlh1zT89RoziSVCbqSVDxJS6ckEzW8loxs+EEXl0dKPQOXiDmbHV+C/fA==", + "dev": true, + "requires": { + "@cucumber/messages": ">=19.1.4 <=22" + } + }, + "commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true + } } }, "@cucumber/html-formatter": { - "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-20.1.0.tgz", - "integrity": "sha512-bu2shjZuVGfAtKaw8ebCBxhgu3Eiaz/P7ZuSxrw9YCa6rOyxMX5zO+4f2FUBTK/AV0b9O5cAB/xitYBrGhlYKg==", + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-21.2.0.tgz", + "integrity": "sha512-4OcSa12Y0v5e4ySDl67+QFTxCG/Y9fxGSkFqvm98ggpTvS7b75whwzupu+lM2lMBw+h3H6P8ZURQr0xQIAwE2A==", "dev": true, "requires": {} }, @@ -14016,12 +14553,12 @@ "requires": {} }, "@cucumber/messages": { - "version": "19.1.4", - "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-19.1.4.tgz", - "integrity": "sha512-Pksl0pnDz2l1+L5Ug85NlG6LWrrklN9qkMxN5Mv+1XZ3T6u580dnE6mVaxjJRdcOq4tR17Pc0RqIDZMyVY1FlA==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-22.0.0.tgz", + "integrity": "sha512-EuaUtYte9ilkxcKmfqGF9pJsHRUU0jwie5ukuZ/1NPTuHS1LxHPsGEODK17RPRbZHOFhqybNzG2rHAwThxEymg==", "dev": true, "requires": { - "@types/uuid": "8.3.4", + "@types/uuid": "9.0.1", "class-transformer": "0.5.1", "reflect-metadata": "0.1.13", "uuid": "9.0.0" @@ -14056,9 +14593,9 @@ } }, "@cucumber/tag-expressions": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-4.1.0.tgz", - "integrity": "sha512-chTnjxV3vryL75N90wJIMdMafXmZoO2JgNJLYpsfcALL2/IQrRiny3vM9DgD5RDCSt1LNloMtb7rGey9YWxCsA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-6.0.0.tgz", + "integrity": "sha512-JbNb/254Wn6b8cfrIJoqR0NekHXvoB/eMvSY4RK11H8k+YZfm7mZesu/3yVX67nkW+Y+PGjZFcgTMcfjwFRsRw==", "dev": true }, "@dinero.js/calculator-number": { @@ -14129,6 +14666,71 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -14247,13 +14849,13 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@noble/secp256k1": { @@ -14411,6 +15013,13 @@ "@octokit/openapi-types": "^14.0.0" } }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true + }, "@redis/bloom": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz", @@ -14606,9 +15215,9 @@ "dev": true }, "@teppeis/multimaps": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-2.0.0.tgz", - "integrity": "sha512-TL1adzq1HdxUf9WYduLcQ/DNGYiz71U31QRgbnr0Ef1cPyOUOsBojxHVWpFeOSUucB6Lrs0LxFRA14ntgtkc9w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@teppeis/multimaps/-/multimaps-3.0.0.tgz", + "integrity": "sha512-ID7fosbc50TbT0MK0EG12O+gAP3W3Aa/Pz4DaTtQtEvlc9Odaqi0de+xuZ7Li2GtK4HzEX7IuRWS/JmZLksR3Q==", "dev": true }, "@tootallnate/once": { @@ -14719,12 +15328,6 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, - "@types/lodash": { - "version": "4.14.186", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz", - "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==", - "dev": true - }, "@types/mdast": { "version": "3.0.10", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", @@ -14868,15 +15471,15 @@ "dev": true }, "@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==", "dev": true }, "@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", + "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "dev": true, "requires": { "@types/node": "*" @@ -15203,12 +15806,6 @@ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", "dev": true }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true - }, "assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -15244,11 +15841,11 @@ "dev": true }, "axios": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz", - "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -16140,16 +16737,6 @@ } } }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "dev": true, - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", @@ -16370,22 +16957,6 @@ "readable-stream": "^2.0.2" } }, - "duration": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz", - "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.46" - } - }, - "durations": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/durations/-/durations-3.4.2.tgz", - "integrity": "sha512-V/lf7y33dGaypZZetVI1eu7BmvkbC4dItq12OElLRpKuaU5JxQstV2zHwLv8P7cNbQ+KL1WD80zMCTx5dNC4dg==", - "dev": true - }, "dynamic-dedupe": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz", @@ -16395,6 +16966,12 @@ "xtend": "^4.0.0" } }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -16446,15 +17023,13 @@ "is-arrayish": "^0.2.1" } }, - "es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", "dev": true, "requires": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" + "stackframe": "^1.3.4" } }, "es6-error": { @@ -16463,27 +17038,6 @@ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", "dev": true }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "dev": true, - "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -16751,23 +17305,6 @@ } } }, - "ext": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", - "dev": true, - "requires": { - "type": "^2.7.2" - }, - "dependencies": { - "type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", - "dev": true - } - } - }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -16796,12 +17333,6 @@ } } }, - "extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -16998,9 +17529,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==" }, "foreground-child": { "version": "2.0.0", @@ -17913,6 +18444,16 @@ "istanbul-lib-report": "^3.0.0" } }, + "jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, "java-properties": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz", @@ -18125,12 +18666,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "dev": true - }, "lodash.capitalize": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", @@ -18299,6 +18834,12 @@ "yallist": "^4.0.0" } }, + "luxon": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", + "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", + "dev": true + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -18520,6 +19061,12 @@ } } }, + "minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true + }, "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -18710,12 +19257,6 @@ "thenify-all": "^1.0.0" } }, - "nanoclone": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", - "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==", - "dev": true - }, "nanoid": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", @@ -18745,12 +19286,6 @@ "integrity": "sha512-EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g==", "dev": true }, - "next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", - "dev": true - }, "nise": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz", @@ -21057,6 +21592,24 @@ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, + "path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, + "requires": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "dev": true + } + } + }, "path-to-regexp": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", @@ -21338,9 +21891,9 @@ } }, "property-expr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz", - "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz", + "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==", "dev": true }, "protocols": { @@ -21687,12 +22240,6 @@ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", "dev": true }, - "regenerator-runtime": { - "version": "0.13.10", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", - "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==", - "dev": true - }, "regexp-match-indices": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regexp-match-indices/-/regexp-match-indices-1.0.2.tgz", @@ -21703,9 +22250,9 @@ } }, "regexp-tree": { - "version": "0.1.24", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz", - "integrity": "sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==", + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", + "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", "dev": true }, "regexpp": { @@ -22337,10 +22884,10 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, - "stack-chain": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz", - "integrity": "sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg==", + "stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", "dev": true }, "statuses": { @@ -22392,6 +22939,17 @@ "strip-ansi": "^6.0.1" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -22401,6 +22959,15 @@ "ansi-regex": "^5.0.1" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -22599,6 +23166,12 @@ "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz", "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==" }, + "tiny-case": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz", + "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==", + "dev": true + }, "tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -22780,12 +23353,6 @@ "tslib": "^1.8.1" } }, - "type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", - "dev": true - }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -22985,17 +23552,6 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, - "verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vfile": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", @@ -23059,9 +23615,9 @@ "dev": true }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true }, "wordwrap": { @@ -23087,6 +23643,17 @@ "strip-ansi": "^6.0.0" } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -23106,11 +23673,17 @@ } }, "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "requires": {} }, + "xmlbuilder": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -23179,18 +23752,23 @@ "dev": true }, "yup": { - "version": "0.32.11", - "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz", - "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-1.2.0.tgz", + "integrity": "sha512-PPqYKSAXjpRCgLgLKVGPA33v5c/WgEx3wi6NFjIiegz90zSwyMpvTFp/uGcVnnbx6to28pgnzp/q8ih3QRjLMQ==", "dev": true, "requires": { - "@babel/runtime": "^7.15.4", - "@types/lodash": "^4.14.175", - "lodash": "^4.17.21", - "lodash-es": "^4.17.21", - "nanoclone": "^0.2.1", - "property-expr": "^2.0.4", - "toposort": "^2.0.2" + "property-expr": "^2.0.5", + "tiny-case": "^1.0.3", + "toposort": "^2.0.2", + "type-fest": "^2.19.0" + }, + "dependencies": { + "type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true + } } }, "zip-stream": { diff --git a/package.json b/package.json index 24cfb0e7..d1ff51ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nostream", - "version": "1.22.6", + "version": "2.1.0", "description": "A Nostr relay written in Typescript.", "supportedNips": [ 1, @@ -13,7 +13,6 @@ 16, 20, 22, - 26, 28, 33, 40 @@ -57,7 +56,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/Cameri/nostream.git" + "url": "git+https://github.com/cameri/nostream.git" }, "keywords": [ "nostr", @@ -67,13 +66,13 @@ "author": "Ricardo Arturo Cabral Mejía (npub1qqqqqqyz0la2jjl752yv8h7wgs3v098mh9nztd4nr6gynaef6uqqt0n47m)", "license": "MIT", "bugs": { - "url": "https://github.com/Cameri/nostream/issues" + "url": "https://github.com/cameri/nostream/issues" }, - "homepage": "https://github.com/Cameri/nostream#readme", + "homepage": "https://github.com/cameri/nostream#readme", "devDependencies": { "@commitlint/cli": "17.2.0", "@commitlint/config-conventional": "17.2.0", - "@cucumber/cucumber": "8.7.0", + "@cucumber/cucumber": "10.2.1", "@cucumber/pretty-formatter": "1.0.0", "@semantic-release/commit-analyzer": "9.0.2", "@semantic-release/git": "10.0.1", @@ -91,7 +90,7 @@ "@types/ramda": "^0.28.13", "@types/sinon": "^10.0.11", "@types/sinon-chai": "^3.2.8", - "@types/ws": "^8.5.3", + "@types/ws": "^8.5.12", "@typescript-eslint/eslint-plugin": "^5.19.0", "@typescript-eslint/parser": "^5.19.0", "chai": "^4.3.6", @@ -116,7 +115,7 @@ }, "dependencies": { "@noble/secp256k1": "1.7.1", - "axios": "1.2.6", + "axios": "^1.7.7", "bech32": "2.0.0", "body-parser": "1.20.1", "debug": "4.3.4", @@ -133,7 +132,7 @@ "redis": "4.5.1", "rxjs": "7.8.0", "tor-control-ts": "^1.0.0", - "ws": "8.12.0" + "ws": "^8.18.0" }, "config": { "commitizen": { diff --git a/resources/css/style.css b/resources/css/style.css index 1ec11f2d..5acc3138 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -175,4 +175,29 @@ right: 8px; top: 38px; } +} + +/* Dark Theme Styles */ +@media (prefers-color-scheme: dark) { + body.dark-theme { + background-color: #2a2a2a; /* Softer gray background */ + color: #e0e0e0; + } + body.dark-theme h1 { + color: #e0e0e0; + } + body.dark-theme p { + color: #b0b0b0; + } + body.dark-theme .btn-primary { + background-color: #3a3a3a; + border-color: #545454; + } + body.dark-theme .btn-primary:hover { + background-color: #545454; + } + body.dark-theme .card { + background-color: #3a3a3a; + border-color: #545454; + } } \ No newline at end of file diff --git a/resources/default-settings.yaml b/resources/default-settings.yaml index 4f76cecf..058b7786 100755 --- a/resources/default-settings.yaml +++ b/resources/default-settings.yaml @@ -3,21 +3,20 @@ info: name: nostream.your-domain.com description: A nostr relay written in Typescript. pubkey: replace-with-your-pubkey-in-hex - contact: operator@your-domain.com + contact: mailto:operator@your-domain.com payments: enabled: false processor: zebedee feeSchedules: admission: - - enabled: false - description: Admission fee charged per public key in msats (1000 msats = 1 satoshi) - amount: 1000000 - whitelists: - pubkeys: - - replace-with-your-pubkey-in-hex - # Allow the following Zap providers: - # LightningTipBot by Calle - - "fcd720c38d9ee337188f47aac845dcd8f590ccdb4a928b76dde18187b4c9d37d" + - enabled: false + description: Admission fee charged per public key in msats (1000 msats = 1 satoshi) + amount: 1000000 + whitelists: + pubkeys: + - replace-with-your-pubkey-in-hex + event_kinds: + - 9735 # Nip-57 Lightning Zap Receipts paymentsProcessors: zebedee: baseURL: https://api.zebedee.io/ @@ -28,6 +27,14 @@ paymentsProcessors: lnbits: baseURL: https://lnbits.your-domain.com/ callbackBaseURL: https://nostream.your-domain.com/callbacks/lnbits + lnurl: + invoiceURL: https://getalby.com/lnurlp/your-username + nodeless: + baseURL: https://nodeless.io + storeId: your-nodeless-io-store-id + opennode: + baseURL: api.opennode.com + callbackBaseURL: https://nostream.your-domain.com/callbacks/opennode network: maxPayloadSize: 524288 # Comment the next line if using CloudFlare proxy @@ -41,24 +48,33 @@ mirroring: limits: invoice: rateLimits: - - period: 60000 - rate: 12 - - period: 3600000 - rate: 30 + - period: 60000 + rate: 12 + - period: 3600000 + rate: 30 ipWhitelist: - - "::1" - - "10.10.10.1" - - "::ffff:10.10.10.1" + - "::1" + - "10.10.10.1" + - "::ffff:10.10.10.1" + admissionCheck: + rateLimits: + - description: 30 admission checks/min or 1 check every 2 seconds + period: 60000 + rate: 30 + ipWhitelist: + - "::1" + - "10.10.10.1" + - "::ffff:10.10.10.1" connection: rateLimits: - - period: 1000 - rate: 12 - - period: 60000 - rate: 48 + - period: 1000 + rate: 12 + - period: 60000 + rate: 48 ipWhitelist: - - "::1" - - "10.10.10.1" - - "::ffff:10.10.10.1" + - "::1" + - "10.10.10.1" + - "::ffff:10.10.10.1" event: eventId: minLeadingZeroBits: 0 @@ -74,79 +90,83 @@ limits: maxPositiveDelta: 900 maxNegativeDelta: 0 content: - - description: 64 KB for event kind ranges 0-10 and 40-49 - kinds: - - - 0 - - 10 - - - 40 - - 49 - maxLength: 65536 - - description: 96 KB for event kind ranges 11-39 and 50-max - kinds: - - - 11 - - 39 - - - 50 - - 9007199254740991 - maxLength: 98304 + - description: 64 KB for event kind ranges 0-10 and 40-49 + maxLength: 102400 + kinds: + - - 0 + - 10 + - - 40 + - 49 + - description: 96 KB for event kind ranges 11-39 and 50-max + maxLength: 102400 + kinds: + - - 11 + - 39 + - - 50 + - 9007199254740991 rateLimits: - - description: 6 events/min for event kinds 0, 3, 40 and 41 - kinds: - - 0 - - 3 - - 40 - - 41 - period: 60000 - rate: 6 - - description: 12 events/min for event kinds 1, 2, 4 and 42 - kinds: - - 1 - - 2 - - 4 - - 42 - period: 60000 - rate: 12 - - description: 30 events/min for event kind ranges 5-7 and 43-49 - kinds: - - - 5 - - 7 - - - 43 - - 49 - period: 60000 - rate: 30 - - description: 24 events/min for replaceable events and parameterized replaceable - events - kinds: - - - 10000 - - 19999 - - - 30000 - - 39999 - period: 60000 - rate: 24 - - description: 60 events/min for ephemeral events - kinds: - - - 20000 - - 29999 - period: 60000 - rate: 60 - - description: 720 events/hour for all events - period: 3600000 - rate: 720 + - description: 6 events/min for event kinds 0, 3, 40 and 41 + kinds: + - 0 + - 3 + - 40 + - 41 + period: 60000 + rate: 6 + - description: 12 events/min for event kinds 1, 2, 4 and 42 + kinds: + - 1 + - 2 + - 4 + - 42 + period: 60000 + rate: 12 + - description: 30 events/min for event kind ranges 5-7 and 43-49 + kinds: + - - 5 + - 7 + - - 43 + - 49 + period: 60000 + rate: 30 + - description: 24 events/min for replaceable events and parameterized replaceable + events + kinds: + - - 10000 + - 19999 + - - 30000 + - 39999 + period: 60000 + rate: 24 + - description: 60 events/min for ephemeral events + kinds: + - - 20000 + - 29999 + period: 60000 + rate: 60 + - description: 720 events/hour for all events + period: 3600000 + rate: 720 whitelists: pubkeys: [] ipAddresses: - - "::1" - - "10.10.10.1" - - "::ffff:10.10.10.1" + - "::1" + - "10.10.10.1" + - "::ffff:10.10.10.1" client: subscription: maxSubscriptions: 10 maxFilters: 10 + maxFilterValues: 2500 + maxSubscriptionIdLength: 256 + maxLimit: 5000 + minPrefixLength: 4 message: rateLimits: - - description: 240 raw messages/min - period: 60000 - rate: 240 + - description: 240 raw messages/min + period: 60000 + rate: 240 ipWhitelist: - - "::1" - - "10.10.10.1" - - "::ffff:10.10.10.1" + - "::1" + - "10.10.10.1" + - "::ffff:10.10.10.1" diff --git a/resources/index.html b/resources/index.html index d6bef0e7..07f3e735 100644 --- a/resources/index.html +++ b/resources/index.html @@ -58,7 +58,7 @@

{{name}}

-
+
-
+
@@ -98,17 +98,26 @@

Invoice expired!

\ No newline at end of file diff --git a/resources/terms.html b/resources/terms.html index 587ba552..6c694fbb 100644 --- a/resources/terms.html +++ b/resources/terms.html @@ -62,5 +62,11 @@

Terms of Service Agreement

+ diff --git a/scripts/start b/scripts/start index 10eee12d..7d1d1925 100755 --- a/scripts/start +++ b/scripts/start @@ -4,6 +4,15 @@ DOCKER_COMPOSE_FILE="${PROJECT_ROOT}/docker-compose.yml" NOSTR_CONFIG_DIR="${PROJECT_ROOT}/.nostr" SETTINGS_FILE="${NOSTR_CONFIG_DIR}/settings.yaml" DEFAULT_SETTINGS_FILE="${PROJECT_ROOT}/resources/default-settings.yaml" +CURRENT_DIR=$(pwd) + +if [[ ${CURRENT_DIR} =~ /scripts$ ]]; then + echo "Please run this script from the Nostream root folder, not the scripts directory." + echo "To do this, change up one directory, and then run the following command:" + echo "./scripts/start" + exit 1 +fi + if [ "$EUID" -eq 0 ] then echo "Error: Nostream should not be run as root." diff --git a/scripts/start_local b/scripts/start_local index 25b31a92..93222310 100755 --- a/scripts/start_local +++ b/scripts/start_local @@ -4,6 +4,14 @@ set -e PROJECT_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))/.." DOCKER_COMPOSE_FILE="${PROJECT_ROOT}/docker-compose.yml" DOCKER_COMPOSE_LOCAL_FILE="${PROJECT_ROOT}/docker-compose.local.yml" +CURRENT_DIR=$(pwd) + +if [[ ${CURRENT_DIR} =~ /scripts$ ]]; then + echo "Please run this script from the Nostream root folder, not the scripts directory." + echo "To do this, change up one directory, and then run the following command:" + echo "./scripts/start" + exit 1 +fi if [ "$EUID" -eq 0 ] then echo "Error: Nostream should not be run as root." diff --git a/scripts/start_with_tor b/scripts/start_with_tor index 581734ab..cb7f52b2 100755 --- a/scripts/start_with_tor +++ b/scripts/start_with_tor @@ -6,6 +6,14 @@ TOR_DATA_DIR="$PROJECT_ROOT/.nostr/tor/data" NOSTR_CONFIG_DIR="${PROJECT_ROOT}/.nostr" SETTINGS_FILE="${NOSTR_CONFIG_DIR}/settings.yaml" DEFAULT_SETTINGS_FILE="${PROJECT_ROOT}/resources/default-settings.yaml" +CURRENT_DIR=$(pwd) + +if [[ ${CURRENT_DIR} =~ /scripts$ ]]; then + echo "Please run this script from the Nostream root folder, not the scripts directory." + echo "To do this, change up one directory, and then run the following command:" + echo "./scripts/start" + exit 1 +fi if [ "$EUID" -eq 0 ] then echo "Error: Nostream should not be run as root." diff --git a/src/@types/base.ts b/src/@types/base.ts index 7065832b..78808cf5 100644 --- a/src/@types/base.ts +++ b/src/@types/base.ts @@ -1,17 +1,23 @@ import { Knex } from 'knex' import { SocketAddress } from 'net' +import { EventTags } from '../constants/base' + export type EventId = string export type Pubkey = string -export type TagName = string +export type TagName = EventTags | string export type Signature = string export type Tag = TagBase & string[] export type Secret = string -export interface TagBase { - 0: TagName - [index: number]: string +type ExtraTagValues = { + [index in Range<2, 100>]?: string +} + +export interface TagBase extends ExtraTagValues { + 0: TagName; + 1: string } type Enumerate< diff --git a/src/@types/clients.ts b/src/@types/clients.ts index 00fbc1a1..8f7ad151 100644 --- a/src/@types/clients.ts +++ b/src/@types/clients.ts @@ -12,6 +12,7 @@ export interface CreateInvoiceResponse { confirmedAt?: Date | null createdAt: Date rawResponse?: string + verifyURL?: string } export interface CreateInvoiceRequest { @@ -20,9 +21,9 @@ export interface CreateInvoiceRequest { requestId?: string } -export type GetInvoiceResponse = Invoice +export type GetInvoiceResponse = Partial export interface IPaymentsProcessor { createInvoice(request: CreateInvoiceRequest): Promise - getInvoice(invoiceId: string): Promise + getInvoice(invoice: string | Invoice): Promise } diff --git a/src/@types/event.ts b/src/@types/event.ts index 52194560..cc9241d4 100644 --- a/src/@types/event.ts +++ b/src/@types/event.ts @@ -1,5 +1,5 @@ import { ContextMetadata, EventId, Pubkey, Tag } from './base' -import { ContextMetadataKey, EventDeduplicationMetadataKey, EventDelegatorMetadataKey, EventExpirationTimeMetadataKey, EventKinds } from '../constants/base' +import { ContextMetadataKey, EventDeduplicationMetadataKey, EventExpirationTimeMetadataKey, EventKinds } from '../constants/base' export interface BaseEvent { id: EventId @@ -21,10 +21,6 @@ export type UnsignedEvent = Omit export type UnidentifiedEvent = Omit -export interface DelegatedEvent extends Event { - [EventDelegatorMetadataKey]?: Pubkey -} - export interface ExpiringEvent extends Event { [EventExpirationTimeMetadataKey]?: number } @@ -42,7 +38,6 @@ export interface DBEvent { event_content: string event_tags: Tag[] event_signature: Buffer - event_delegator?: Buffer | null event_deduplication?: string | null first_seen: Date deleted_at?: Date diff --git a/src/@types/invoice.ts b/src/@types/invoice.ts index dbf9ec69..1644bcf2 100644 --- a/src/@types/invoice.ts +++ b/src/@types/invoice.ts @@ -8,7 +8,8 @@ export enum InvoiceUnit { export enum InvoiceStatus { PENDING = 'pending', - COMPLETED = 'completed' + COMPLETED = 'completed', + EXPIRED = 'expired', } export interface Invoice { @@ -24,6 +25,11 @@ export interface Invoice { expiresAt: Date | null updatedAt: Date createdAt: Date + verifyURL?: string +} + +export interface LnurlInvoice extends Invoice { + verifyURL: string } export interface DBInvoice { @@ -39,4 +45,5 @@ export interface DBInvoice { expires_at: Date updated_at: Date created_at: Date + verify_url: string } diff --git a/src/@types/repositories.ts b/src/@types/repositories.ts index 2470bff2..671dfaee 100644 --- a/src/@types/repositories.ts +++ b/src/@types/repositories.ts @@ -16,13 +16,16 @@ export interface IEventRepository { create(event: Event): Promise upsert(event: Event): Promise findByFilters(filters: SubscriptionFilter[]): IQueryResult - insertStubs(pubkey: string, eventIdsToDelete: EventId[]): Promise deleteByPubkeyAndIds(pubkey: Pubkey, ids: EventId[]): Promise } export interface IInvoiceRepository { findById(id: string, client?: DatabaseClient): Promise upsert(invoice: Partial, client?: DatabaseClient): Promise + updateStatus( + invoice: Pick, + client?: DatabaseClient, + ): Promise confirmInvoice( invoiceId: string, amountReceived: bigint, diff --git a/src/@types/services.ts b/src/@types/services.ts index 4d3fb5d2..c1427cfb 100644 --- a/src/@types/services.ts +++ b/src/@types/services.ts @@ -2,17 +2,17 @@ import { Invoice } from './invoice' import { Pubkey } from './base' export interface IPaymentsService { - getInvoiceFromPaymentsProcessor(invoiceId: string): Promise + getInvoiceFromPaymentsProcessor(invoice: string | Invoice): Promise> createInvoice( pubkey: Pubkey, amount: bigint, description: string, ): Promise - updateInvoice(invoice: Invoice): Promise + updateInvoice(invoice: Partial): Promise + updateInvoiceStatus(invoice: Pick): Promise confirmInvoice( - invoice: Pick, + invoice: Pick, ): Promise - sendNewInvoiceNotification(invoice: Invoice): Promise sendInvoiceUpdateNotification(invoice: Invoice): Promise getPendingInvoices(): Promise } diff --git a/src/@types/settings.ts b/src/@types/settings.ts index da59af30..a8121f7b 100644 --- a/src/@types/settings.ts +++ b/src/@types/settings.ts @@ -82,6 +82,10 @@ export interface EventLimits { export interface ClientSubscriptionLimits { maxSubscriptions?: number maxFilters?: number + maxFilterValues?: number + maxLimit?: number + minPrefixLength?: number + maxSubscriptionIdLength?: number } export interface ClientLimits { @@ -108,8 +112,14 @@ export interface InvoiceLimits { ipWhitelist?: string[] } +export interface AdmissionCheckLimits { + rateLimits: RateLimit[] + ipWhitelist?: string[] +} + export interface Limits { invoice?: InvoiceLimits + admissionCheck?: AdmissionCheckLimits connection?: ConnectionLimits client?: ClientLimits event?: EventLimits @@ -122,6 +132,7 @@ export interface Worker { export interface FeeScheduleWhitelists { pubkeys?: Pubkey[] + event_kinds?: (EventKinds | [EventKinds, EventKinds])[] } export interface FeeSchedule { @@ -142,20 +153,42 @@ export interface Payments { feeSchedules: FeeSchedules } +export interface LnurlPaymentsProcessor { + invoiceURL: string +} + export interface ZebedeePaymentsProcessor { baseURL: string callbackBaseURL: string ipWhitelist: string[] } -export interface LNbitsPaymentProcessor { +export interface NodelessPaymentsProcessor { + baseURL: string + storeId: string +} + +export interface LNbitsPaymentsProcessor { + baseURL: string + callbackBaseURL: string +} + +export interface OpenNodePaymentsProcessor { baseURL: string callbackBaseURL: string } +export interface NodelessPaymentsProcessor { + baseURL: string + storeId: string +} + export interface PaymentsProcessors { + lnurl?: LnurlPaymentsProcessor, zebedee?: ZebedeePaymentsProcessor - lnbits?: LNbitsPaymentProcessor + lnbits?: LNbitsPaymentsProcessor + nodeless?: NodelessPaymentsProcessor + opennode?: OpenNodePaymentsProcessor } export interface Local { @@ -170,6 +203,10 @@ export interface Mirror { address: string filters?: SubscriptionFilter[] secret?: Secret + limits?: { + event?: EventLimits + } + skipAdmissionCheck?: boolean } export interface Mirroring { diff --git a/src/@types/subscription.ts b/src/@types/subscription.ts index e78efb2b..265506d5 100644 --- a/src/@types/subscription.ts +++ b/src/@types/subscription.ts @@ -5,7 +5,7 @@ export type SubscriptionId = string export interface SubscriptionFilter { ids?: EventId[] - kinds?: EventKinds[] + kinds?: (EventKinds | number)[] since?: number until?: number authors?: Pubkey[] diff --git a/src/adapters/web-server-adapter.ts b/src/adapters/web-server-adapter.ts index f22046e6..c56cb473 100644 --- a/src/adapters/web-server-adapter.ts +++ b/src/adapters/web-server-adapter.ts @@ -33,10 +33,10 @@ export class WebServerAdapter extends EventEmitter implements IWebServerAdapter } private onClientError(error: Error, socket: Duplex) { - console.error('web-server-adapter: client socket error:', error) if (error['code'] === 'ECONNRESET' || !socket.writable) { return } + console.error('web-server-adapter: client socket error:', error) socket.end('HTTP/1.1 400 Bad Request\r\nContent-Type: text/html\r\n') } diff --git a/src/adapters/web-socket-adapter.ts b/src/adapters/web-socket-adapter.ts index 92e29e08..ab1b9f7a 100644 --- a/src/adapters/web-socket-adapter.ts +++ b/src/adapters/web-socket-adapter.ts @@ -186,6 +186,8 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter console.error(`web-socket-adapter: malformed message from client ${this.clientId} (${this.getClientAddress()}):`, error.message) } this.sendMessage(createNoticeMessage(`invalid: ${error.message}`)) + } else { + console.error('web-socket-adapter: unable to handle message:', error) } } else { console.error('web-socket-adapter: unable to handle message:', error) diff --git a/src/app/app.ts b/src/app/app.ts index 34673b09..44c38b66 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -83,6 +83,7 @@ export class App implements IRunnable { debug('starting worker') createWorker({ WORKER_TYPE: 'worker', + WORKER_INDEX: i.toString(), }) } logCentered(`${workerCount} client workers started`, width) diff --git a/src/app/maintenance-worker.ts b/src/app/maintenance-worker.ts index bc7ddc50..a4c5ce7b 100644 --- a/src/app/maintenance-worker.ts +++ b/src/app/maintenance-worker.ts @@ -1,5 +1,5 @@ +import { mergeDeepLeft, path, pipe } from 'ramda' import { IRunnable } from '../@types/base' -import { path } from 'ramda' import { createLogger } from '../factories/logger-factory' import { delayMs } from '../utils/misc' @@ -45,23 +45,34 @@ export class MaintenanceWorker implements IRunnable { let successful = 0 for (const invoice of invoices) { - debug('invoice %s: %o', invoice.id, invoice) try { - debug('getting invoice %s from payment processor', invoice.id) - const updatedInvoice = await this.paymentsService.getInvoiceFromPaymentsProcessor(invoice.id) + debug('getting invoice %s from payment processor: %o', invoice.id, invoice) + const updatedInvoice = await this.paymentsService.getInvoiceFromPaymentsProcessor(invoice) await delay() - debug('updating invoice %s: %o', invoice.id, invoice) - await this.paymentsService.updateInvoice(updatedInvoice) + debug('updating invoice status %s: %o', updatedInvoice.id, updatedInvoice) + + if (typeof updatedInvoice.id !== 'string' || typeof updatedInvoice.status !== 'string') { + continue + } + const { id, status } = updatedInvoice + + await this.paymentsService.updateInvoiceStatus({ id, status }) if ( invoice.status !== updatedInvoice.status && updatedInvoice.status == InvoiceStatus.COMPLETED - && invoice.confirmedAt + && updatedInvoice.confirmedAt ) { debug('confirming invoice %s & notifying %s', invoice.id, invoice.pubkey) + + const update = pipe( + mergeDeepLeft(updatedInvoice), + mergeDeepLeft({ amountPaid: invoice.amountRequested }), + )(invoice) + await Promise.all([ - this.paymentsService.confirmInvoice(invoice), - this.paymentsService.sendInvoiceUpdateNotification(invoice), + this.paymentsService.confirmInvoice(update), + this.paymentsService.sendInvoiceUpdateNotification(update), ]) await delay() diff --git a/src/app/static-mirroring-worker.ts b/src/app/static-mirroring-worker.ts index 9c2500ec..229f1416 100644 --- a/src/app/static-mirroring-worker.ts +++ b/src/app/static-mirroring-worker.ts @@ -1,12 +1,15 @@ -import { anyPass, map, path } from 'ramda' +import { anyPass, map, mergeDeepRight, path } from 'ramda' import { RawData, WebSocket } from 'ws' import cluster from 'cluster' import { randomUUID } from 'crypto' import { createRelayedEventMessage, createSubscriptionMessage } from '../utils/messages' -import { isEventIdValid, isEventMatchingFilter, isEventSignatureValid } from '../utils/event' -import { Mirror, Settings } from '../@types/settings' +import { EventLimits, FeeSchedule, Mirror, Settings } from '../@types/settings' +import { getEventExpiration, getEventProofOfWork, getPubkeyProofOfWork, getPublicKey, getRelayPrivateKey, isEventIdValid, isEventKindOrRangeMatch, isEventMatchingFilter, isEventSignatureValid, isExpiredEvent } from '../utils/event' +import { IEventRepository, IUserRepository } from '../@types/repositories' import { createLogger } from '../factories/logger-factory' +import { Event } from '../@types/event' +import { EventExpirationTimeMetadataKey } from '../constants/base' import { IRunnable } from '../@types/base' import { OutgoingEventMessage } from '../@types/messages' import { RelayedEvent } from '../@types/event' @@ -19,6 +22,8 @@ export class StaticMirroringWorker implements IRunnable { private config: Mirror public constructor( + private readonly eventRepository: IEventRepository, + private readonly userRepository: IUserRepository, private readonly process: NodeJS.Process, private readonly settings: () => Settings, ) { @@ -57,7 +62,7 @@ export class StaticMirroringWorker implements IRunnable { this.send(JSON.stringify(createSubscriptionMessage(subscriptionId, filters))) } }) - .on('message', async function (raw: RawData) { + .on('message', async (raw: RawData) => { try { const message = JSON.parse(raw.toString('utf8')) as OutgoingEventMessage @@ -70,7 +75,7 @@ export class StaticMirroringWorker implements IRunnable { return } - const event = message[2] + let event = message[2] if (!anyPass(map(isEventMatchingFilter, config.filters))(event)) { return @@ -80,10 +85,34 @@ export class StaticMirroringWorker implements IRunnable { return } + if (isExpiredEvent(event)) { + return + } + + const eventExpiration = getEventExpiration(event) + if (eventExpiration) { + event = { + ...event, + [EventExpirationTimeMetadataKey]: eventExpiration, + } as any + } + + if (!this.canAcceptEvent(event)) { + return + } + + if (!await this.isUserAdmitted(event)) { + return + } + since = Math.floor(Date.now() / 1000) - 30 - if (cluster.isWorker && typeof process.send === 'function') { - debug('%s >> local: %s', config.address, event.id) + debug('%s >> local: %s', config.address, event.id) + + const inserted = await this.eventRepository.create(event) + + if (inserted && cluster.isWorker && typeof process.send === 'function') { + process.send({ eventName: WebSocketServerAdapterEvent.Broadcast, event, @@ -110,6 +139,165 @@ export class StaticMirroringWorker implements IRunnable { this.client = createMirror(this.config) } + private getRelayPublicKey(): string { + const relayPrivkey = getRelayPrivateKey(this.settings().info.relay_url) + return getPublicKey(relayPrivkey) + } + + private canAcceptEvent(event: Event): boolean { + if (this.getRelayPublicKey() === event.pubkey) { + debug(`event ${event.id} not accepted: pubkey is relay pubkey`) + return false + } + + const now = Math.floor(Date.now() / 1000) + + const eventLimits = this.settings().limits?.event ?? {} + + const eventLimitOverrides = this.config.limits.event ?? {} + + const limits = mergeDeepRight(eventLimits, eventLimitOverrides) as EventLimits + + if (Array.isArray(limits.content)) { + for (const limit of limits.content) { + if ( + typeof limit.maxLength !== 'undefined' + && limit.maxLength > 0 + && event.content.length > limit.maxLength + && ( + !Array.isArray(limit.kinds) + || limit.kinds.some(isEventKindOrRangeMatch(event)) + ) + ) { + debug(`event ${event.id} not accepted: content is longer than ${limit.maxLength} bytes`) + return false + } + } + } else if ( + typeof limits.content?.maxLength !== 'undefined' + && limits.content?.maxLength > 0 + && event.content.length > limits.content.maxLength + && ( + !Array.isArray(limits.content.kinds) + || limits.content.kinds.some(isEventKindOrRangeMatch(event)) + ) + ) { + debug(`event ${event.id} not accepted: content is longer than ${limits.content.maxLength} bytes`) + return false + } + + if ( + typeof limits.createdAt?.maxPositiveDelta !== 'undefined' + && limits.createdAt.maxPositiveDelta > 0 + && event.created_at > now + limits.createdAt.maxPositiveDelta) { + debug(`event ${event.id} not accepted: created_at is more than ${limits.createdAt.maxPositiveDelta} seconds in the future`) + return false + } + + if ( + typeof limits.createdAt?.maxNegativeDelta !== 'undefined' + && limits.createdAt.maxNegativeDelta > 0 + && event.created_at < now - limits.createdAt.maxNegativeDelta) { + debug(`event ${event.id} not accepted: created_at is more than ${limits.createdAt.maxNegativeDelta} seconds in the past`) + return false + } + + if ( + typeof limits.eventId?.minLeadingZeroBits !== 'undefined' + && limits.eventId.minLeadingZeroBits > 0 + ) { + const pow = getEventProofOfWork(event.id) + if (pow < limits.eventId.minLeadingZeroBits) { + debug(`event ${event.id} not accepted: pow difficulty ${pow}<${limits.eventId.minLeadingZeroBits}`) + return false + } + } + + if ( + typeof limits.pubkey?.minLeadingZeroBits !== 'undefined' + && limits.pubkey.minLeadingZeroBits > 0 + ) { + const pow = getPubkeyProofOfWork(event.pubkey) + if (pow < limits.pubkey.minLeadingZeroBits) { + debug(`event ${event.id} not accepted: pow pubkey difficulty ${pow}<${limits.pubkey.minLeadingZeroBits}`) + return false + } + } + + if ( + typeof limits.pubkey?.whitelist !== 'undefined' + && limits.pubkey.whitelist.length > 0 + && !limits.pubkey.whitelist.some((prefix) => event.pubkey.startsWith(prefix)) + ) { + debug(`event ${event.id} not accepted: pubkey not allowed: ${event.pubkey}`) + return false + } + + if ( + typeof limits.pubkey?.blacklist !== 'undefined' + && limits.pubkey.blacklist.length > 0 + && limits.pubkey.blacklist.some((prefix) => event.pubkey.startsWith(prefix)) + ) { + debug(`event ${event.id} not accepted: pubkey not allowed: ${event.pubkey}`) + return false + } + + if ( + typeof limits.kind?.whitelist !== 'undefined' + && limits.kind.whitelist.length > 0 + && !limits.kind.whitelist.some(isEventKindOrRangeMatch(event))) { + debug(`blocked: event kind ${event.kind} not allowed`) + return false + } + + if ( + typeof limits.kind?.blacklist !== 'undefined' + && limits.kind.blacklist.length > 0 + && limits.kind.blacklist.some(isEventKindOrRangeMatch(event))) { + debug(`blocked: event kind ${event.kind} not allowed`) + return false + } + + return true + } + + protected async isUserAdmitted(event: Event): Promise { + const currentSettings = this.settings() + + if (this.config.skipAdmissionCheck === true) { + return true + } + + if (currentSettings.payments?.enabled !== true) { + return true + } + + const isApplicableFee = (feeSchedule: FeeSchedule) => + feeSchedule.enabled + && !feeSchedule.whitelists?.pubkeys?.some((prefix) => event.pubkey.startsWith(prefix)) + && !feeSchedule.whitelists?.event_kinds?.some(isEventKindOrRangeMatch(event)) + + const feeSchedules = currentSettings.payments?.feeSchedules?.admission?.filter(isApplicableFee) + + if (!Array.isArray(feeSchedules) || !feeSchedules.length) { + return true + } + + const user = await this.userRepository.findByPubkey(event.pubkey) + if (user?.isAdmitted !== true) { + debug(`user not admitted: ${event.pubkey}`) + return false + } + + const minBalance = currentSettings.limits?.event?.pubkey?.minBalance + if (minBalance && user.balance < minBalance) { + debug(`user not admitted: user balance ${user.balance} < ${minBalance}`) + return false + } + + return true + } + private onMessage(message: { eventName: string, event: unknown, source: string }): void { if ( message.eventName !== WebSocketServerAdapterEvent.Broadcast diff --git a/src/cache/client.ts b/src/cache/client.ts index d4b819b7..8c743753 100644 --- a/src/cache/client.ts +++ b/src/cache/client.ts @@ -15,7 +15,9 @@ let instance: CacheClient | undefined = undefined export const getCacheClient = (): CacheClient => { if (!instance) { const config = getCacheConfig() - debug('config: %o', config) + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { password: _, ...loggableConfig } = config + debug('config: %o', loggableConfig) instance = createClient(config) } diff --git a/src/constants/base.ts b/src/constants/base.ts index 569da881..8b9adca8 100644 --- a/src/constants/base.ts +++ b/src/constants/base.ts @@ -5,6 +5,7 @@ export enum EventKinds { CONTACT_LIST = 3, ENCRYPTED_DIRECT_MESSAGE = 4, DELETE = 5, + REPOST = 6, REACTION = 7, // Channels CHANNEL_CREATION = 40, @@ -17,6 +18,9 @@ export enum EventKinds { // Relay-only RELAY_INVITE = 50, INVOICE_UPDATE = 402, + // Lightning zaps + ZAP_REQUEST = 9734, + ZAP_RECEIPT = 9735, // Replaceable events REPLACEABLE_FIRST = 10000, REPLACEABLE_LAST = 19999, @@ -27,24 +31,23 @@ export enum EventKinds { PARAMETERIZED_REPLACEABLE_FIRST = 30000, PARAMETERIZED_REPLACEABLE_LAST = 39999, USER_APPLICATION_FIRST = 40000, - USER_APPLICATION_LAST = Number.MAX_SAFE_INTEGER, } export enum EventTags { Event = 'e', Pubkey = 'p', // Multicast = 'm', - Delegation = 'delegation', Deduplication = 'd', Expiration = 'expiration', + Invoice = 'bolt11', } export enum PaymentsProcessors { + LNURL = 'lnurl', ZEBEDEE = 'zebedee', LNBITS = 'lnbits', } -export const EventDelegatorMetadataKey = Symbol('Delegator') export const EventDeduplicationMetadataKey = Symbol('Deduplication') export const ContextMetadataKey = Symbol('Context') export const EventExpirationTimeMetadataKey = Symbol('Expiration') diff --git a/src/controllers/admission/get-admission-check-controller.ts b/src/controllers/admission/get-admission-check-controller.ts new file mode 100644 index 00000000..5900643a --- /dev/null +++ b/src/controllers/admission/get-admission-check-controller.ts @@ -0,0 +1,70 @@ +import { Request, Response } from 'express' +import { createLogger } from '../../factories/logger-factory' +import { getRemoteAddress } from '../../utils/http' +import { IController } from '../../@types/controllers' +import { IRateLimiter } from '../../@types/utils' +import { IUserRepository } from '../../@types/repositories' +import { path } from 'ramda' +import { Settings } from '../../@types/settings' + +const debug = createLogger('get-admission-check-controller') + +export class GetSubmissionCheckController implements IController { + public constructor( + private readonly userRepository: IUserRepository, + private readonly settings: () => Settings, + private readonly rateLimiter: () => IRateLimiter, + ){} + + public async handleRequest(request: Request, response: Response): Promise { + const currentSettings = this.settings() + + const limited = await this.isRateLimited(request, currentSettings) + if (limited) { + response + .status(429) + .setHeader('content-type', 'text/plain; charset=utf8') + .send('Too many requests') + return + } + + const pubkey = request.params.pubkey + const user = await this.userRepository.findByPubkey(pubkey) + + let userAdmitted = false + + const minBalance = currentSettings.limits?.event?.pubkey?.minBalance + if (user && user.isAdmitted && (!minBalance || user.balance >= minBalance)) { + userAdmitted = true + } + + response + .status(200) + .setHeader('content-type', 'application/json; charset=utf8') + .send({ userAdmitted }) + + return + } + + public async isRateLimited(request: Request, settings: Settings) { + const rateLimits = path(['limits', 'admissionCheck', 'rateLimits'], settings) + if (!Array.isArray(rateLimits) || !rateLimits.length) { + return false + } + + const ipWhitelist = path(['limits', 'admissionCheck', 'ipWhitelist'], settings) + const remoteAddress = getRemoteAddress(request, settings) + + let limited = false + if (Array.isArray(ipWhitelist) && !ipWhitelist.includes(remoteAddress)) { + const rateLimiter = this.rateLimiter() + for (const { rate, period } of rateLimits) { + if (await rateLimiter.hit(`${remoteAddress}:admission-check:${period}`, 1, { period, rate })) { + debug('rate limited %s: %d in %d milliseconds', remoteAddress, rate, period) + limited = true + } + } + } + return limited + } +} \ No newline at end of file diff --git a/src/controllers/callbacks/lnbits-callback-controller.ts b/src/controllers/callbacks/lnbits-callback-controller.ts index a4e3a480..465e6de0 100644 --- a/src/controllers/callbacks/lnbits-callback-controller.ts +++ b/src/controllers/callbacks/lnbits-callback-controller.ts @@ -1,9 +1,12 @@ import { Request, Response } from 'express' +import { deriveFromSecret, hmacSha256 } from '../../utils/secret' +import { Invoice, InvoiceStatus } from '../../@types/invoice' import { createLogger } from '../../factories/logger-factory' +import { createSettings } from '../../factories/settings-factory' +import { getRemoteAddress } from '../../utils/http' import { IController } from '../../@types/controllers' import { IInvoiceRepository } from '../../@types/repositories' -import { InvoiceStatus } from '../../@types/invoice' import { IPaymentsService } from '../../@types/services' const debug = createLogger('lnbits-callback-controller') @@ -22,6 +25,37 @@ export class LNbitsCallbackController implements IController { debug('request headers: %o', request.headers) debug('request body: %o', request.body) + const settings = createSettings() + const remoteAddress = getRemoteAddress(request, settings) + const paymentProcessor = settings.payments?.processor ?? 'null' + + if (paymentProcessor !== 'lnbits') { + debug('denied request from %s to /callbacks/lnbits which is not the current payment processor', remoteAddress) + response + .status(403) + .send('Forbidden') + return + } + + let validationPassed = false + + if (typeof request.query.hmac === 'string' && request.query.hmac.match(/^[0-9]{1,20}:[0-9a-f]{64}$/)) { + const split = request.query.hmac.split(':') + if (hmacSha256(deriveFromSecret('lnbits-callback-hmac-key'), split[0]).toString('hex') === split[1]) { + if (parseInt(split[0]) > Date.now()) { + validationPassed = true + } + } + } + + if (!validationPassed) { + debug('unauthorized request from %s to /callbacks/lnbits', remoteAddress) + response + .status(403) + .send('Forbidden') + return + } + const body = request.body if (!body || typeof body !== 'object' || typeof body.payment_hash !== 'string' || body.payment_hash.length !== 64) { response @@ -72,8 +106,8 @@ export class LNbitsCallbackController implements IController { invoice.amountPaid = invoice.amountRequested try { - await this.paymentsService.confirmInvoice(invoice) - await this.paymentsService.sendInvoiceUpdateNotification(invoice) + await this.paymentsService.confirmInvoice(invoice as Invoice) + await this.paymentsService.sendInvoiceUpdateNotification(invoice as Invoice) } catch (error) { console.error(`Unable to confirm invoice ${invoice.id}`, error) diff --git a/src/controllers/callbacks/nodeless-callback-controller.ts b/src/controllers/callbacks/nodeless-callback-controller.ts new file mode 100644 index 00000000..2e5be0fb --- /dev/null +++ b/src/controllers/callbacks/nodeless-callback-controller.ts @@ -0,0 +1,110 @@ +import { always, applySpec, ifElse, is, path, prop, propEq, propSatisfies } from 'ramda' +import { Request, Response } from 'express' + +import { Invoice, InvoiceStatus } from '../../@types/invoice' +import { createLogger } from '../../factories/logger-factory' +import { createSettings } from '../../factories/settings-factory' +import { fromNodelessInvoice } from '../../utils/transform' +import { hmacSha256 } from '../../utils/secret' +import { IController } from '../../@types/controllers' +import { IPaymentsService } from '../../@types/services' + +const debug = createLogger('nodeless-callback-controller') + +export class NodelessCallbackController implements IController { + public constructor( + private readonly paymentsService: IPaymentsService, + ) {} + + // TODO: Validate + public async handleRequest( + request: Request, + response: Response, + ) { + debug('callback request headers: %o', request.headers) + debug('callback request body: %O', request.body) + + const settings = createSettings() + const paymentProcessor = settings.payments?.processor + + const expected = hmacSha256(process.env.NODELESS_WEBHOOK_SECRET, (request as any).rawBody).toString('hex') + const actual = request.headers['nodeless-signature'] + + if (expected !== actual) { + console.error('nodeless callback request rejected: signature mismatch:', { expected, actual }) + response + .status(403) + .send('Forbidden') + return + } + + if (paymentProcessor !== 'nodeless') { + debug('denied request from %s to /callbacks/nodeless which is not the current payment processor') + response + .status(403) + .send('Forbidden') + return + } + + const nodelessInvoice = applySpec({ + id: prop('uuid'), + status: prop('status'), + satsAmount: prop('amount'), + metadata: prop('metadata'), + paidAt: ifElse( + propEq('status', 'paid'), + always(new Date().toISOString()), + always(null), + ), + createdAt: ifElse( + propSatisfies(is(String), 'createdAt'), + prop('createdAt'), + path(['metadata', 'createdAt']), + ), + })(request.body) + + debug('nodeless invoice: %O', nodelessInvoice) + + const invoice = fromNodelessInvoice(nodelessInvoice) + + debug('invoice: %O', invoice) + + let updatedInvoice: Invoice + try { + updatedInvoice = await this.paymentsService.updateInvoiceStatus(invoice) + debug('updated invoice: %O', updatedInvoice) + } catch (error) { + console.error(`Unable to persist invoice ${invoice.id}`, error) + + throw error + } + + if ( + updatedInvoice.status !== InvoiceStatus.COMPLETED + && !updatedInvoice.confirmedAt + ) { + response + .status(200) + .send() + + return + } + + invoice.amountPaid = invoice.amountRequested + updatedInvoice.amountPaid = invoice.amountRequested + + try { + await this.paymentsService.confirmInvoice(invoice) + await this.paymentsService.sendInvoiceUpdateNotification(updatedInvoice) + } catch (error) { + console.error(`Unable to confirm invoice ${invoice.id}`, error) + + throw error + } + + response + .status(200) + .setHeader('content-type', 'application/json; charset=utf8') + .send('{"status":"ok"}') + } +} diff --git a/src/controllers/callbacks/opennode-callback-controller.ts b/src/controllers/callbacks/opennode-callback-controller.ts new file mode 100644 index 00000000..f3755df0 --- /dev/null +++ b/src/controllers/callbacks/opennode-callback-controller.ts @@ -0,0 +1,71 @@ +import { Request, Response } from 'express' + +import { Invoice, InvoiceStatus } from '../../@types/invoice' +import { createLogger } from '../../factories/logger-factory' +import { fromOpenNodeInvoice } from '../../utils/transform' +import { IController } from '../../@types/controllers' +import { IPaymentsService } from '../../@types/services' + +const debug = createLogger('opennode-callback-controller') + +export class OpenNodeCallbackController implements IController { + public constructor( + private readonly paymentsService: IPaymentsService, + ) {} + + // TODO: Validate + public async handleRequest( + request: Request, + response: Response, + ) { + debug('request headers: %o', request.headers) + debug('request body: %O', request.body) + + const invoice = fromOpenNodeInvoice(request.body) + + debug('invoice', invoice) + + let updatedInvoice: Invoice + try { + updatedInvoice = await this.paymentsService.updateInvoiceStatus(invoice) + } catch (error) { + console.error(`Unable to persist invoice ${invoice.id}`, error) + + throw error + } + + if ( + updatedInvoice.status !== InvoiceStatus.COMPLETED + && !updatedInvoice.confirmedAt + ) { + response + .status(200) + .send() + + return + } + + invoice.amountPaid = invoice.amountRequested + updatedInvoice.amountPaid = invoice.amountRequested + + try { + await this.paymentsService.confirmInvoice({ + id: invoice.id, + pubkey: invoice.pubkey, + status: updatedInvoice.status, + amountPaid: updatedInvoice.amountRequested, + confirmedAt: updatedInvoice.confirmedAt, + }) + await this.paymentsService.sendInvoiceUpdateNotification(updatedInvoice) + } catch (error) { + console.error(`Unable to confirm invoice ${invoice.id}`, error) + + throw error + } + + response + .status(200) + .setHeader('content-type', 'text/plain; charset=utf8') + .send('OK') + } +} diff --git a/src/controllers/callbacks/zebedee-callback-controller.ts b/src/controllers/callbacks/zebedee-callback-controller.ts index 9320676f..869861d7 100644 --- a/src/controllers/callbacks/zebedee-callback-controller.ts +++ b/src/controllers/callbacks/zebedee-callback-controller.ts @@ -1,9 +1,11 @@ import { Request, Response } from 'express' +import { Invoice, InvoiceStatus } from '../../@types/invoice' import { createLogger } from '../../factories/logger-factory' +import { createSettings } from '../../factories/settings-factory' import { fromZebedeeInvoice } from '../../utils/transform' +import { getRemoteAddress } from '../../utils/http' import { IController } from '../../@types/controllers' -import { InvoiceStatus } from '../../@types/invoice' import { IPaymentsService } from '../../@types/services' const debug = createLogger('zebedee-callback-controller') @@ -21,14 +23,35 @@ export class ZebedeeCallbackController implements IController { debug('request headers: %o', request.headers) debug('request body: %O', request.body) + const settings = createSettings() + + const { ipWhitelist = [] } = settings.paymentsProcessors?.zebedee ?? {} + const remoteAddress = getRemoteAddress(request, settings) + const paymentProcessor = settings.payments?.processor + + if (ipWhitelist.length && !ipWhitelist.includes(remoteAddress)) { + debug('unauthorized request from %s to /callbacks/zebedee', remoteAddress) + response + .status(403) + .send('Forbidden') + return + } + + if (paymentProcessor !== 'zebedee') { + debug('denied request from %s to /callbacks/zebedee which is not the current payment processor', remoteAddress) + response + .status(403) + .send('Forbidden') + return + } + const invoice = fromZebedeeInvoice(request.body) debug('invoice', invoice) + let updatedInvoice: Invoice try { - if (invoice.bolt11) { - await this.paymentsService.updateInvoice(invoice) - } + updatedInvoice = await this.paymentsService.updateInvoiceStatus(invoice) } catch (error) { console.error(`Unable to persist invoice ${invoice.id}`, error) @@ -36,8 +59,8 @@ export class ZebedeeCallbackController implements IController { } if ( - invoice.status !== InvoiceStatus.COMPLETED - && !invoice.confirmedAt + updatedInvoice.status !== InvoiceStatus.COMPLETED + && !updatedInvoice.confirmedAt ) { response .status(200) @@ -47,10 +70,18 @@ export class ZebedeeCallbackController implements IController { } invoice.amountPaid = invoice.amountRequested + invoice.status = updatedInvoice.status + updatedInvoice.amountPaid = invoice.amountRequested try { - await this.paymentsService.confirmInvoice(invoice) - await this.paymentsService.sendInvoiceUpdateNotification(invoice) + await this.paymentsService.confirmInvoice({ + id: invoice.id, + pubkey: invoice.pubkey, + status: invoice.status, + confirmedAt: invoice.confirmedAt, + amountPaid: invoice.amountRequested, + }) + await this.paymentsService.sendInvoiceUpdateNotification(updatedInvoice) } catch (error) { console.error(`Unable to confirm invoice ${invoice.id}`, error) diff --git a/src/controllers/invoices/get-invoice-controller.ts b/src/controllers/invoices/get-invoice-controller.ts new file mode 100644 index 00000000..8ac88505 --- /dev/null +++ b/src/controllers/invoices/get-invoice-controller.ts @@ -0,0 +1,34 @@ +import { path, pathEq } from 'ramda' +import { Request, Response } from 'express' +import { readFileSync } from 'fs' + +import { createSettings } from '../../factories/settings-factory' +import { FeeSchedule } from '../../@types/settings' +import { IController } from '../../@types/controllers' + +let pageCache: string + +export class GetInvoiceController implements IController { + public async handleRequest( + _req: Request, + res: Response, + ): Promise { + const settings = createSettings() + + if (pathEq(['payments', 'enabled'], true, settings) + && pathEq(['payments', 'feeSchedules', 'admission', '0', 'enabled'], true, settings)) { + if (!pageCache) { + const name = path(['info', 'name'])(settings) + const feeSchedule = path(['payments', 'feeSchedules', 'admission', '0'], settings) + pageCache = readFileSync('./resources/index.html', 'utf8') + .replaceAll('{{name}}', name) + .replaceAll('{{processor}}', settings.payments.processor) + .replaceAll('{{amount}}', (BigInt(feeSchedule.amount) / 1000n).toString()) + } + + res.status(200).setHeader('content-type', 'text/html; charset=utf8').send(pageCache) + } else { + res.status(404).send() + } + } +} \ No newline at end of file diff --git a/src/controllers/invoices/get-invoice-status-controller.ts b/src/controllers/invoices/get-invoice-status-controller.ts index 95cb912a..2018a7a9 100644 --- a/src/controllers/invoices/get-invoice-status-controller.ts +++ b/src/controllers/invoices/get-invoice-status-controller.ts @@ -19,7 +19,7 @@ export class GetInvoiceStatusController implements IController { debug('invalid invoice id: %s', invoiceId) response .status(400) - .setHeader('content-type', 'text/plain; charset=utf8') + .setHeader('content-type', 'application/json; charset=utf8') .send({ id: invoiceId, status: 'invalid invoice' }) return } @@ -32,7 +32,7 @@ export class GetInvoiceStatusController implements IController { debug('invoice not found: %s', invoiceId) response .status(404) - .setHeader('content-type', 'text/plain; charset=utf8') + .setHeader('content-type', 'application/json; charset=utf8') .send({ id: invoiceId, status: 'not found' }) return } @@ -40,16 +40,16 @@ export class GetInvoiceStatusController implements IController { response .status(200) .setHeader('content-type', 'application/json; charset=utf8') - .send(JSON.stringify({ + .send({ id: invoice.id, status: invoice.status, - })) + }) } catch (error) { console.error(`get-invoice-status-controller: unable to get invoice ${invoiceId}:`, error) response .status(500) - .setHeader('content-type', 'text/plain; charset=utf8') + .setHeader('content-type', 'application/json; charset=utf8') .send({ id: invoiceId, status: 'error' }) } } diff --git a/src/controllers/invoices/post-invoice-controller.ts b/src/controllers/invoices/post-invoice-controller.ts index b4817e59..e6fd959c 100644 --- a/src/controllers/invoices/post-invoice-controller.ts +++ b/src/controllers/invoices/post-invoice-controller.ts @@ -136,7 +136,12 @@ export class PostInvoiceController implements IController { } let invoice: Invoice - const amount = admissionFee.reduce((sum, fee) => sum + BigInt(fee.amount), 0n) + const amount = admissionFee.reduce((sum, fee) => { + return fee.enabled && !fee.whitelists?.pubkeys?.includes(pubkey) + ? BigInt(fee.amount) + sum + : sum + }, 0n) + try { const description = `${relayName} Admission Fee for ${toBech32('npub')(pubkey)}` @@ -145,8 +150,6 @@ export class PostInvoiceController implements IController { amount, description, ) - - await this.paymentsService.sendNewInvoiceNotification(invoice) } catch (error) { console.error('Unable to create invoice. Reason:', error) response @@ -165,9 +168,10 @@ export class PostInvoiceController implements IController { relay_url: relayUrl, pubkey, relay_pubkey: relayPubkey, - expires_at: invoice.expiresAt?.toISOString(), + expires_at: invoice.expiresAt?.toISOString() ?? '', invoice: invoice.bolt11, amount: amount / 1000n, + processor: currentSettings.payments.processor, } const body = Object diff --git a/src/database/client.ts b/src/database/client.ts index b37207ea..555cf249 100644 --- a/src/database/client.ts +++ b/src/database/client.ts @@ -46,27 +46,32 @@ const getMasterConfig = (): Knex.Config => ({ : 60000, } as any) -const getReadReplicaConfig = (): Knex.Config => ({ +const getReadReplicaConfigByIndex = (index: number): Knex.Config => ({ tag: 'read-replica', client: 'pg', connection: { - host: process.env.RR_DB_HOST, - port: Number(process.env.RR_DB_PORT), - user: process.env.RR_DB_USER, - password: process.env.RR_DB_PASSWORD, - database: process.env.RR_DB_NAME, + host: process.env[`RR${index}_DB_HOST`], + port: Number(process.env[`RR${index}_DB_PORT`]), + user: process.env[`RR${index}_DB_USER`], + password: process.env[`RR${index}_DB_PASSWORD`], + database: process.env[`RR${index}_DB_NAME`], }, pool: { - min: process.env.RR_DB_MIN_POOL_SIZE ? Number(process.env.RR_DB_MIN_POOL_SIZE) : 0, - max: process.env.RR_DB_MAX_POOL_SIZE ? Number(process.env.RR_DB_MAX_POOL_SIZE) : 3, + min: process.env[`RR${index}_DB_MIN_POOL_SIZE`] ? Number(process.env[`RR${index}_DB_MIN_POOL_SIZE`]) : 0, + max: process.env[`RR${index}_DB_MAX_POOL_SIZE`] ? Number(process.env[`RR${index}_DB_MAX_POOL_SIZE`]) : 3, idleTimeoutMillis: 60000, propagateCreateError: false, - acquireTimeoutMillis: process.env.RR_DB_ACQUIRE_CONNECTION_TIMEOUT - ? Number(process.env.RR_DB_ACQUIRE_CONNECTION_TIMEOUT) + acquireTimeoutMillis: process.env[`RR${index}_DB_ACQUIRE_CONNECTION_TIMEOUT`] + ? Number(process.env[`RR${index}_DB_ACQUIRE_CONNECTION_TIMEOUT`]) : 60000, }, } as any) +const getReadReplicaConfig = (): Knex.Config => { + const readReplicaIndex = Number(process.env.WORKER_INDEX) % Number(process.env.READ_REPLICAS) + return getReadReplicaConfigByIndex(readReplicaIndex) +} + let writeClient: Knex export const getMasterDbClient = () => { diff --git a/src/factories/controllers/get-admission-check-controller-factory.ts b/src/factories/controllers/get-admission-check-controller-factory.ts new file mode 100644 index 00000000..c7d2d47e --- /dev/null +++ b/src/factories/controllers/get-admission-check-controller-factory.ts @@ -0,0 +1,16 @@ +import { createSettings } from '../settings-factory' +import { getMasterDbClient } from '../../database/client' +import { GetSubmissionCheckController } from '../../controllers/admission/get-admission-check-controller' +import { slidingWindowRateLimiterFactory } from '../rate-limiter-factory' +import { UserRepository } from '../../repositories/user-repository' + +export const createGetAdmissionCheckController = () => { + const dbClient = getMasterDbClient() + const userRepository = new UserRepository(dbClient) + + return new GetSubmissionCheckController( + userRepository, + createSettings, + slidingWindowRateLimiterFactory + ) +} diff --git a/src/factories/controllers/get-invoice-controller-factory.ts b/src/factories/controllers/get-invoice-controller-factory.ts new file mode 100644 index 00000000..e4bb3ccd --- /dev/null +++ b/src/factories/controllers/get-invoice-controller-factory.ts @@ -0,0 +1,3 @@ +import { GetInvoiceController } from '../../controllers/invoices/get-invoice-controller' + +export const createGetInvoiceController = () => new GetInvoiceController() diff --git a/src/factories/controllers/get-invoice-status-controller-factory.ts b/src/factories/controllers/get-invoice-status-controller-factory.ts new file mode 100644 index 00000000..cbdc421d --- /dev/null +++ b/src/factories/controllers/get-invoice-status-controller-factory.ts @@ -0,0 +1,11 @@ +import { GetInvoiceStatusController } from '../../controllers/invoices/get-invoice-status-controller' +import { getReadReplicaDbClient } from '../../database/client' +import { InvoiceRepository } from '../../repositories/invoice-repository' + +export const createGetInvoiceStatusController = () => { + const rrDbClient = getReadReplicaDbClient() + + const invoiceRepository = new InvoiceRepository(rrDbClient) + + return new GetInvoiceStatusController(invoiceRepository) +} diff --git a/src/factories/controllers/lnbits-callback-controller-factory.ts b/src/factories/controllers/lnbits-callback-controller-factory.ts new file mode 100644 index 00000000..312b6e86 --- /dev/null +++ b/src/factories/controllers/lnbits-callback-controller-factory.ts @@ -0,0 +1,12 @@ +import { createPaymentsService } from '../payments-service-factory' +import { getMasterDbClient } from '../../database/client' +import { IController } from '../../@types/controllers' +import { InvoiceRepository } from '../../repositories/invoice-repository' +import { LNbitsCallbackController } from '../../controllers/callbacks/lnbits-callback-controller' + +export const createLNbitsCallbackController = (): IController => { + return new LNbitsCallbackController( + createPaymentsService(), + new InvoiceRepository(getMasterDbClient()) + ) +} diff --git a/src/factories/controllers/nodeless-callback-controller-factory.ts b/src/factories/controllers/nodeless-callback-controller-factory.ts new file mode 100644 index 00000000..ab34d980 --- /dev/null +++ b/src/factories/controllers/nodeless-callback-controller-factory.ts @@ -0,0 +1,7 @@ +import { createPaymentsService } from '../payments-service-factory' +import { IController } from '../../@types/controllers' +import { NodelessCallbackController } from '../../controllers/callbacks/nodeless-callback-controller' + +export const createNodelessCallbackController = (): IController => new NodelessCallbackController( + createPaymentsService(), +) diff --git a/src/factories/controllers/opennode-callback-controller-factory.ts b/src/factories/controllers/opennode-callback-controller-factory.ts new file mode 100644 index 00000000..e6829211 --- /dev/null +++ b/src/factories/controllers/opennode-callback-controller-factory.ts @@ -0,0 +1,9 @@ +import { createPaymentsService } from '../payments-service-factory' +import { IController } from '../../@types/controllers' +import { OpenNodeCallbackController } from '../../controllers/callbacks/opennode-callback-controller' + +export const createOpenNodeCallbackController = (): IController => { + return new OpenNodeCallbackController( + createPaymentsService(), + ) +} diff --git a/src/factories/controllers/post-invoice-controller-factory.ts b/src/factories/controllers/post-invoice-controller-factory.ts new file mode 100644 index 00000000..50331572 --- /dev/null +++ b/src/factories/controllers/post-invoice-controller-factory.ts @@ -0,0 +1,20 @@ +import { createPaymentsService } from '../payments-service-factory' +import { createSettings } from '../settings-factory' +import { getMasterDbClient } from '../../database/client' +import { IController } from '../../@types/controllers' +import { PostInvoiceController } from '../../controllers/invoices/post-invoice-controller' +import { slidingWindowRateLimiterFactory } from '../rate-limiter-factory' +import { UserRepository } from '../../repositories/user-repository' + +export const createPostInvoiceController = (): IController => { + const dbClient = getMasterDbClient() + const userRepository = new UserRepository(dbClient) + const paymentsService = createPaymentsService() + + return new PostInvoiceController( + userRepository, + paymentsService, + createSettings, + slidingWindowRateLimiterFactory, + ) +} diff --git a/src/factories/controllers/zebedee-callback-controller-factory.ts b/src/factories/controllers/zebedee-callback-controller-factory.ts new file mode 100644 index 00000000..dd6b19a3 --- /dev/null +++ b/src/factories/controllers/zebedee-callback-controller-factory.ts @@ -0,0 +1,9 @@ +import { createPaymentsService } from '../payments-service-factory' +import { IController } from '../../@types/controllers' +import { ZebedeeCallbackController } from '../../controllers/callbacks/zebedee-callback-controller' + +export const createZebedeeCallbackController = (): IController => { + return new ZebedeeCallbackController( + createPaymentsService(), + ) +} diff --git a/src/factories/delegated-event-strategy-factory.ts b/src/factories/delegated-event-strategy-factory.ts deleted file mode 100644 index 1f828a9c..00000000 --- a/src/factories/delegated-event-strategy-factory.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { isDeleteEvent, isEphemeralEvent, isReplaceableEvent } from '../utils/event' -import { DefaultEventStrategy } from '../handlers/event-strategies/default-event-strategy' -import { EphemeralEventStrategy } from '../handlers/event-strategies/ephemeral-event-strategy' -import { Event } from '../@types/event' -import { Factory } from '../@types/base' -import { IEventRepository } from '../@types/repositories' -import { IEventStrategy } from '../@types/message-handlers' -import { IWebSocketAdapter } from '../@types/adapters' - -export const delegatedEventStrategyFactory = ( - eventRepository: IEventRepository, -): Factory>, [Event, IWebSocketAdapter]> => - ([event, adapter]: [Event, IWebSocketAdapter]) => { - if (isEphemeralEvent(event)) { - return new EphemeralEventStrategy(adapter) - } else if (isReplaceableEvent(event) || isDeleteEvent(event)) { - return - } - - return new DefaultEventStrategy(adapter, eventRepository) - } diff --git a/src/factories/get-invoice-status-controller-factory.ts b/src/factories/get-invoice-status-controller-factory.ts deleted file mode 100644 index e8b84383..00000000 --- a/src/factories/get-invoice-status-controller-factory.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { GetInvoiceStatusController } from '../controllers/invoices/get-invoice-status-controller' -import { getReadReplicaDbClient } from '../database/client' -import { InvoiceRepository } from '../repositories/invoice-repository' - -export const createGetInvoiceStatusController = () => { - const rrDbClient = getReadReplicaDbClient() - - const invoiceRepository = new InvoiceRepository(rrDbClient) - - return new GetInvoiceStatusController(invoiceRepository) -} diff --git a/src/factories/lnbits-callback-controller-factory.ts b/src/factories/lnbits-callback-controller-factory.ts deleted file mode 100644 index 326def2b..00000000 --- a/src/factories/lnbits-callback-controller-factory.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { createPaymentsService } from './payments-service-factory' -import { getMasterDbClient } from '../database/client' -import { IController } from '../@types/controllers' -import { InvoiceRepository } from '../repositories/invoice-repository' -import { LNbitsCallbackController } from '../controllers/callbacks/lnbits-callback-controller' - -export const createLNbitsCallbackController = (): IController => { - return new LNbitsCallbackController( - createPaymentsService(), - new InvoiceRepository(getMasterDbClient()) - ) -} diff --git a/src/factories/message-handler-factory.ts b/src/factories/message-handler-factory.ts index a3123ce2..b1c11e9c 100644 --- a/src/factories/message-handler-factory.ts +++ b/src/factories/message-handler-factory.ts @@ -1,11 +1,8 @@ import { IEventRepository, IUserRepository } from '../@types/repositories' import { IncomingMessage, MessageType } from '../@types/messages' import { createSettings } from './settings-factory' -import { DelegatedEventMessageHandler } from '../handlers/delegated-event-message-handler' -import { delegatedEventStrategyFactory } from './delegated-event-strategy-factory' import { EventMessageHandler } from '../handlers/event-message-handler' import { eventStrategyFactory } from './event-strategy-factory' -import { isDelegatedEvent } from '../utils/event' import { IWebSocketAdapter } from '../@types/adapters' import { slidingWindowRateLimiterFactory } from './rate-limiter-factory' import { SubscribeMessageHandler } from '../handlers/subscribe-message-handler' @@ -18,16 +15,6 @@ export const messageHandlerFactory = ( switch (message[0]) { case MessageType.EVENT: { - if (isDelegatedEvent(message[1])) { - return new DelegatedEventMessageHandler( - adapter, - delegatedEventStrategyFactory(eventRepository), - userRepository, - createSettings, - slidingWindowRateLimiterFactory, - ) - } - return new EventMessageHandler( adapter, eventStrategyFactory(eventRepository), @@ -39,7 +26,7 @@ export const messageHandlerFactory = ( case MessageType.REQ: return new SubscribeMessageHandler(adapter, eventRepository, createSettings) case MessageType.CLOSE: - return new UnsubscribeMessageHandler(adapter,) + return new UnsubscribeMessageHandler(adapter) default: throw new Error(`Unknown message type: ${String(message[0]).substring(0, 64)}`) } diff --git a/src/factories/payments-processor-factory.ts b/src/factories/payments-processor-factory.ts index e588eeac..b26f045f 100644 --- a/src/factories/payments-processor-factory.ts +++ b/src/factories/payments-processor-factory.ts @@ -1,107 +1,34 @@ -import axios, { CreateAxiosDefaults } from 'axios' -import { path } from 'ramda' - +import { createLNbitsPaymentProcessor } from './payments-processors/lnbits-payments-processor-factory' +import { createLnurlPaymentsProcessor } from './payments-processors/lnurl-payments-processor-factory' import { createLogger } from './logger-factory' +import { createNodelessPaymentsProcessor } from './payments-processors/nodeless-payments-processor-factory' +import { createOpenNodePaymentsProcessor } from './payments-processors/opennode-payments-processor-factory' import { createSettings } from './settings-factory' +import { createZebedeePaymentsProcessor } from './payments-processors/zebedee-payments-processor-factory' import { IPaymentsProcessor } from '../@types/clients' -import { LNbitsPaymentsProcesor } from '../payments-processors/lnbits-payment-processor' import { NullPaymentsProcessor } from '../payments-processors/null-payments-processor' -import { PaymentsProcessor } from '../payments-processors/payments-procesor' -import { Settings } from '../@types/settings' -import { ZebedeePaymentsProcesor } from '../payments-processors/zebedee-payments-processor' const debug = createLogger('create-payments-processor') -const getZebedeeAxiosConfig = (settings: Settings): CreateAxiosDefaults => { - if (!process.env.ZEBEDEE_API_KEY) { - const error = new Error('ZEBEDEE_API_KEY must be set.') - console.error('Unable to get Zebedee config.', error) - throw error - } - - return { - headers: { - 'content-type': 'application/json', - 'apikey': process.env.ZEBEDEE_API_KEY, - }, - baseURL: path(['paymentsProcessors', 'zebedee', 'baseURL'], settings), - maxRedirects: 1, - } -} - -const getLNbitsAxiosConfig = (settings: Settings): CreateAxiosDefaults => { - if (!process.env.LNBITS_API_KEY) { - throw new Error('LNBITS_API_KEY must be set to an invoice or admin key.') - } - - return { - headers: { - 'content-type': 'application/json', - 'x-api-key': process.env.LNBITS_API_KEY, - }, - baseURL: path(['paymentsProcessors', 'lnbits', 'baseURL'], settings), - maxRedirects: 1, - } -} - -const createZebedeePaymentsProcessor = (settings: Settings): IPaymentsProcessor => { - const callbackBaseURL = path(['paymentsProcessors', 'zebedee', 'callbackBaseURL'], settings) as string | undefined - if (typeof callbackBaseURL === 'undefined' || callbackBaseURL.indexOf('nostream.your-domain.com') >= 0) { - const error = new Error('Setting paymentsProcessor.zebedee.callbackBaseURL is not configured.') - console.error('Unable to create payments processor.', error) - - throw error - } - - if ( - !Array.isArray(settings.paymentsProcessors?.zebedee?.ipWhitelist) - || !settings.paymentsProcessors?.zebedee?.ipWhitelist?.length - ) { - const error = new Error('Setting paymentsProcessor.zebedee.ipWhitelist is empty.') - console.error('Unable to create payments processor.', error) - - throw error - } - - const config = getZebedeeAxiosConfig(settings) - debug('config: %o', config) - const client = axios.create(config) - - const zpp = new ZebedeePaymentsProcesor(client, createSettings) - - return new PaymentsProcessor(zpp) -} - -const createLNbitsPaymentProcessor = (settings: Settings): IPaymentsProcessor => { - const callbackBaseURL = path(['paymentsProcessors', 'lnbits', 'callbackBaseURL'], settings) as string | undefined - if (typeof callbackBaseURL === 'undefined' || callbackBaseURL.indexOf('nostream.your-domain.com') >= 0) { - const error = new Error('Setting paymentsProcessor.lnbits.callbackBaseURL is not configured.') - console.error('Unable to create payments processor.', error) - - throw error - } - - const config = getLNbitsAxiosConfig(settings) - debug('config: %o', config) - const client = axios.create(config) - - const pp = new LNbitsPaymentsProcesor(client, createSettings) - - return new PaymentsProcessor(pp) -} - export const createPaymentsProcessor = (): IPaymentsProcessor => { debug('create payments processor') + const settings = createSettings() if (!settings.payments?.enabled) { return new NullPaymentsProcessor() } switch (settings.payments?.processor) { + case 'lnurl': + return createLnurlPaymentsProcessor(settings) case 'zebedee': return createZebedeePaymentsProcessor(settings) case 'lnbits': return createLNbitsPaymentProcessor(settings) + case 'nodeless': + return createNodelessPaymentsProcessor(settings) + case 'opennode': + return createOpenNodePaymentsProcessor(settings) default: return new NullPaymentsProcessor() } diff --git a/src/factories/payments-processors/lnbits-payments-processor-factory.ts b/src/factories/payments-processors/lnbits-payments-processor-factory.ts new file mode 100644 index 00000000..582593bb --- /dev/null +++ b/src/factories/payments-processors/lnbits-payments-processor-factory.ts @@ -0,0 +1,39 @@ +import axios, { CreateAxiosDefaults } from 'axios' +import { path } from 'ramda' + +import { createSettings } from '../settings-factory' +import { IPaymentsProcessor } from '../../@types/clients' +import { LNbitsPaymentsProcessor } from '../../payments-processors/lnbits-payment-processor' +import { Settings } from '../../@types/settings' + + +const getLNbitsAxiosConfig = (settings: Settings): CreateAxiosDefaults => { + if (!process.env.LNBITS_API_KEY) { + throw new Error('LNBITS_API_KEY must be set to an invoice or admin key.') + } + + return { + headers: { + 'content-type': 'application/json', + 'x-api-key': process.env.LNBITS_API_KEY, + }, + baseURL: path(['paymentsProcessors', 'lnbits', 'baseURL'], settings), + maxRedirects: 1, + } +} + +export const createLNbitsPaymentProcessor = (settings: Settings): IPaymentsProcessor => { + const callbackBaseURL = path(['paymentsProcessors', 'lnbits', 'callbackBaseURL'], settings) as string | undefined + if (typeof callbackBaseURL === 'undefined' || callbackBaseURL.indexOf('nostream.your-domain.com') >= 0) { + const error = new Error('Setting paymentsProcessor.lnbits.callbackBaseURL is not configured.') + console.error('Unable to create payments processor.', error) + + throw error + } + + const config = getLNbitsAxiosConfig(settings) + + const client = axios.create(config) + + return new LNbitsPaymentsProcessor(client, createSettings) +} diff --git a/src/factories/payments-processors/lnurl-payments-processor-factory.ts b/src/factories/payments-processors/lnurl-payments-processor-factory.ts new file mode 100644 index 00000000..f1254a19 --- /dev/null +++ b/src/factories/payments-processors/lnurl-payments-processor-factory.ts @@ -0,0 +1,18 @@ +import axios from 'axios' +import { path } from 'ramda' + +import { createSettings } from '../settings-factory' +import { IPaymentsProcessor } from '../../@types/clients' +import { LnurlPaymentsProcessor } from '../../payments-processors/lnurl-payments-processor' +import { Settings } from '../../@types/settings' + +export const createLnurlPaymentsProcessor = (settings: Settings): IPaymentsProcessor => { + const invoiceURL = path(['paymentsProcessors', 'lnurl', 'invoiceURL'], settings) as string | undefined + if (typeof invoiceURL === 'undefined') { + throw new Error('Unable to create payments processor: Setting paymentsProcessor.lnurl.invoiceURL is not configured.') + } + + const client = axios.create() + + return new LnurlPaymentsProcessor(client, createSettings) +} diff --git a/src/factories/payments-processors/nodeless-payments-processor-factory.ts b/src/factories/payments-processors/nodeless-payments-processor-factory.ts new file mode 100644 index 00000000..ab0abd33 --- /dev/null +++ b/src/factories/payments-processors/nodeless-payments-processor-factory.ts @@ -0,0 +1,31 @@ +import axios, { CreateAxiosDefaults } from 'axios' +import { path } from 'ramda' + +import { createSettings } from '../settings-factory' +import { IPaymentsProcessor } from '../../@types/clients' +import { NodelessPaymentsProcessor } from '../../payments-processors/nodeless-payments-processor' +import { Settings } from '../../@types/settings' + +const getNodelessAxiosConfig = (settings: Settings): CreateAxiosDefaults => { + if (!process.env.NODELESS_API_KEY) { + const error = new Error('NODELESS_API_KEY must be set.') + console.error('Unable to get Nodeless config.', error) + throw error + } + + return { + headers: { + 'content-type': 'application/json', + 'authorization': `Bearer ${process.env.NODELESS_API_KEY}`, + 'accept': 'application/json', + }, + baseURL: path(['paymentsProcessors', 'nodeless', 'baseURL'], settings), + maxRedirects: 1, + } +} + +export const createNodelessPaymentsProcessor = (settings: Settings): IPaymentsProcessor => { + const client = axios.create(getNodelessAxiosConfig(settings)) + + return new NodelessPaymentsProcessor(client, createSettings) +} diff --git a/src/factories/payments-processors/opennode-payments-processor-factory.ts b/src/factories/payments-processors/opennode-payments-processor-factory.ts new file mode 100644 index 00000000..9a51853b --- /dev/null +++ b/src/factories/payments-processors/opennode-payments-processor-factory.ts @@ -0,0 +1,39 @@ +import axios, { CreateAxiosDefaults } from 'axios' +import { path } from 'ramda' + +import { createSettings } from '../settings-factory' +import { IPaymentsProcessor } from '../../@types/clients' +import { OpenNodePaymentsProcessor } from '../../payments-processors/opennode-payments-processor' +import { Settings } from '../../@types/settings' + +const getOpenNodeAxiosConfig = (settings: Settings): CreateAxiosDefaults => { + if (!process.env.OPENNODE_API_KEY) { + const error = new Error('OPENNODE_API_KEY must be set.') + console.error('Unable to get OpenNode config.', error) + throw error + } + + return { + headers: { + 'content-type': 'application/json', + 'authorization': process.env.OPENNODE_API_KEY, + }, + baseURL: path(['paymentsProcessors', 'opennode', 'baseURL'], settings), + maxRedirects: 1, + } +} + +export const createOpenNodePaymentsProcessor = (settings: Settings): IPaymentsProcessor => { + const callbackBaseURL = path(['paymentsProcessors', 'opennode', 'callbackBaseURL'], settings) as string | undefined + if (typeof callbackBaseURL === 'undefined' || callbackBaseURL.indexOf('nostream.your-domain.com') >= 0) { + const error = new Error('Setting paymentsProcessor.opennode.callbackBaseURL is not configured.') + console.error('Unable to create payments processor.', error) + + throw error + } + + const config = getOpenNodeAxiosConfig(settings) + const client = axios.create(config) + + return new OpenNodePaymentsProcessor(client, createSettings) +} diff --git a/src/factories/payments-processors/zebedee-payments-processor-factory.ts b/src/factories/payments-processors/zebedee-payments-processor-factory.ts new file mode 100644 index 00000000..ba3841a7 --- /dev/null +++ b/src/factories/payments-processors/zebedee-payments-processor-factory.ts @@ -0,0 +1,50 @@ +import axios, { CreateAxiosDefaults } from 'axios' +import { path } from 'ramda' + +import { createSettings } from '../settings-factory' +import { IPaymentsProcessor } from '../../@types/clients' +import { Settings } from '../../@types/settings' +import { ZebedeePaymentsProcessor } from '../../payments-processors/zebedee-payments-processor' + +const getZebedeeAxiosConfig = (settings: Settings): CreateAxiosDefaults => { + if (!process.env.ZEBEDEE_API_KEY) { + const error = new Error('ZEBEDEE_API_KEY must be set.') + console.error('Unable to get Zebedee config.', error) + throw error + } + + return { + headers: { + 'content-type': 'application/json', + 'apikey': process.env.ZEBEDEE_API_KEY, + }, + baseURL: path(['paymentsProcessors', 'zebedee', 'baseURL'], settings), + maxRedirects: 1, + } +} + +export const createZebedeePaymentsProcessor = (settings: Settings): IPaymentsProcessor => { + const callbackBaseURL = path(['paymentsProcessors', 'zebedee', 'callbackBaseURL'], settings) as string | undefined + if (typeof callbackBaseURL === 'undefined' || callbackBaseURL.indexOf('nostream.your-domain.com') >= 0) { + const error = new Error('Setting paymentsProcessor.zebedee.callbackBaseURL is not configured.') + console.error('Unable to create payments processor.', error) + + throw error + } + + if ( + !Array.isArray(settings.paymentsProcessors?.zebedee?.ipWhitelist) + || !settings.paymentsProcessors?.zebedee?.ipWhitelist?.length + ) { + const error = new Error('Setting paymentsProcessor.zebedee.ipWhitelist is empty.') + console.error('Unable to create payments processor.', error) + + throw error + } + + const config = getZebedeeAxiosConfig(settings) + + const client = axios.create(config) + + return new ZebedeePaymentsProcessor(client, createSettings) +} diff --git a/src/factories/post-invoice-controller-factory.ts b/src/factories/post-invoice-controller-factory.ts deleted file mode 100644 index 2cc3f299..00000000 --- a/src/factories/post-invoice-controller-factory.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { createPaymentsService } from './payments-service-factory' -import { createSettings } from './settings-factory' -import { getMasterDbClient } from '../database/client' -import { IController } from '../@types/controllers' -import { PostInvoiceController } from '../controllers/invoices/post-invoice-controller' -import { slidingWindowRateLimiterFactory } from './rate-limiter-factory' -import { UserRepository } from '../repositories/user-repository' - -export const createPostInvoiceController = (): IController => { - const dbClient = getMasterDbClient() - const userRepository = new UserRepository(dbClient) - const paymentsService = createPaymentsService() - - return new PostInvoiceController( - userRepository, - paymentsService, - createSettings, - slidingWindowRateLimiterFactory, - ) -} diff --git a/src/factories/static-mirroring.worker-factory.ts b/src/factories/static-mirroring.worker-factory.ts index 99908145..234430e4 100644 --- a/src/factories/static-mirroring.worker-factory.ts +++ b/src/factories/static-mirroring.worker-factory.ts @@ -1,6 +1,19 @@ +import { getMasterDbClient, getReadReplicaDbClient } from '../database/client' import { createSettings } from './settings-factory' +import { EventRepository } from '../repositories/event-repository' import { StaticMirroringWorker } from '../app/static-mirroring-worker' +import { UserRepository } from '../repositories/user-repository' export const staticMirroringWorkerFactory = () => { - return new StaticMirroringWorker(process, createSettings) + const dbClient = getMasterDbClient() + const readReplicaDbClient = getReadReplicaDbClient() + const eventRepository = new EventRepository(dbClient, readReplicaDbClient) + const userRepository = new UserRepository(dbClient) + + return new StaticMirroringWorker( + eventRepository, + userRepository, + process, + createSettings, + ) } diff --git a/src/factories/web-app-factory.ts b/src/factories/web-app-factory.ts index ef518c10..627218f4 100644 --- a/src/factories/web-app-factory.ts +++ b/src/factories/web-app-factory.ts @@ -1,12 +1,9 @@ import express from 'express' import helmet from 'helmet' -import { createLogger } from './logger-factory' import { createSettings } from './settings-factory' import router from '../routes' -const debug = createLogger('web-app-factory') - export const createWebApp = () => { const app = express() app @@ -31,8 +28,6 @@ export const createWebApp = () => { 'font-src': ["'self'", 'https://cdn.jsdelivr.net/npm/'], } - debug('CSP directives: %o', directives) - return helmet.contentSecurityPolicy({ directives })(req, res, next) }) .use('/favicon.ico', express.static('./resources/favicon.ico')) diff --git a/src/factories/zebedee-callback-controller-factory.ts b/src/factories/zebedee-callback-controller-factory.ts deleted file mode 100644 index 72091b06..00000000 --- a/src/factories/zebedee-callback-controller-factory.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { createPaymentsService } from './payments-service-factory' -import { IController } from '../@types/controllers' -import { ZebedeeCallbackController } from '../controllers/callbacks/zebedee-callback-controller' - -export const createZebedeeCallbackController = (): IController => { - return new ZebedeeCallbackController( - createPaymentsService(), - ) -} diff --git a/src/handlers/delegated-event-message-handler.ts b/src/handlers/delegated-event-message-handler.ts deleted file mode 100644 index 13ede1f2..00000000 --- a/src/handlers/delegated-event-message-handler.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { EventDelegatorMetadataKey, EventTags } from '../constants/base' -import { createCommandResult } from '../utils/messages' -import { createLogger } from '../factories/logger-factory' -import { DelegatedEvent } from '../@types/event' -import { EventMessageHandler } from './event-message-handler' -import { IMessageHandler } from '../@types/message-handlers' -import { IncomingEventMessage } from '../@types/messages' -import { isDelegatedEventValid } from '../utils/event' -import { WebSocketAdapterEvent } from '../constants/adapter' - -const debug = createLogger('delegated-event-message-handler') - -export class DelegatedEventMessageHandler extends EventMessageHandler implements IMessageHandler { - public async handleMessage(message: IncomingEventMessage): Promise { - const [, event] = message - - let reason = await this.isEventValid(event) - if (reason) { - debug('event %s rejected: %s', event.id, reason) - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, reason)) - return - } - - if (await this.isRateLimited(event)) { - debug('event %s rejected: rate-limited') - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'rate-limited: slow down')) - return - } - - reason = this.canAcceptEvent(event) - if (reason) { - debug('event %s rejected: %s', event.id, reason) - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, reason)) - return - } - - reason = await this.isUserAdmitted(event) - if (reason) { - debug('event %s rejected: %s', event.id, reason) - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, reason)) - return - } - - const [, delegator] = event.tags.find((tag) => tag.length === 4 && tag[0] === EventTags.Delegation) - const delegatedEvent: DelegatedEvent = { - ...event, - [EventDelegatorMetadataKey]: delegator, - } - - const strategy = this.strategyFactory([delegatedEvent, this.webSocket]) - - if (typeof strategy?.execute !== 'function') { - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: event not supported')) - return - } - - try { - await strategy.execute(delegatedEvent) - } catch (error) { - console.error('error handling message', message, error) - this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: unable to process event')) - } - } - - protected async isEventValid(event: DelegatedEvent): Promise { - const reason = await super.isEventValid(event) - if (reason) { - return reason - } - - if (!await isDelegatedEventValid(event)) { - return 'invalid: delegation verification failed' - } - } -} diff --git a/src/handlers/event-message-handler.ts b/src/handlers/event-message-handler.ts index bbea8775..b3ecf7fc 100644 --- a/src/handlers/event-message-handler.ts +++ b/src/handlers/event-message-handler.ts @@ -1,6 +1,6 @@ import { Event, ExpiringEvent } from '../@types/event' import { EventRateLimit, FeeSchedule, Settings } from '../@types/settings' -import { getEventExpiration, getEventProofOfWork, getPubkeyProofOfWork, isEventIdValid, isEventKindOrRangeMatch, isEventSignatureValid, isExpiredEvent } from '../utils/event' +import { getEventExpiration, getEventProofOfWork, getPubkeyProofOfWork, getPublicKey, getRelayPrivateKey, isEventIdValid, isEventKindOrRangeMatch, isEventSignatureValid, isExpiredEvent } from '../utils/event' import { IEventStrategy, IMessageHandler } from '../@types/message-handlers' import { ContextMetadataKey } from '../constants/base' import { createCommandResult } from '../utils/messages' @@ -79,7 +79,15 @@ export class EventMessageHandler implements IMessageHandler { } } + protected getRelayPublicKey(): string { + const relayPrivkey = getRelayPrivateKey(this.settings().info.relay_url) + return getPublicKey(relayPrivkey) + } + protected canAcceptEvent(event: Event): string | undefined { + if (this.getRelayPublicKey() === event.pubkey) { + return + } const now = Math.floor(Date.now()/1000) const limits = this.settings().limits?.event ?? {} @@ -185,6 +193,10 @@ export class EventMessageHandler implements IMessageHandler { } protected async isRateLimited(event: Event): Promise { + if (this.getRelayPublicKey() === event.pubkey) { + return false + } + const { whitelists, rateLimits } = this.settings().limits?.event ?? {} if (!rateLimits || !rateLimits.length) { return false @@ -249,9 +261,14 @@ export class EventMessageHandler implements IMessageHandler { return } + if (this.getRelayPublicKey() === event.pubkey) { + return + } + const isApplicableFee = (feeSchedule: FeeSchedule) => feeSchedule.enabled && !feeSchedule.whitelists?.pubkeys?.some((prefix) => event.pubkey.startsWith(prefix)) + && !feeSchedule.whitelists?.event_kinds?.some(isEventKindOrRangeMatch(event)) const feeSchedules = currentSettings.payments?.feeSchedules?.admission?.filter(isApplicableFee) if (!Array.isArray(feeSchedules) || !feeSchedules.length) { @@ -273,14 +290,15 @@ export class EventMessageHandler implements IMessageHandler { protected addExpirationMetadata(event: Event): Event | ExpiringEvent { const eventExpiration: number = getEventExpiration(event) - if (eventExpiration) { - const expiringEvent: ExpiringEvent = { - ...event, - [EventExpirationTimeMetadataKey]: eventExpiration, - } - return expiringEvent - } else { + if (!eventExpiration) { return event } + + const expiringEvent: ExpiringEvent = { + ...event, + [EventExpirationTimeMetadataKey]: eventExpiration, + } + + return expiringEvent } } diff --git a/src/handlers/event-strategies/delete-event-strategy.ts b/src/handlers/event-strategies/delete-event-strategy.ts index c03479ff..c25a3b6b 100644 --- a/src/handlers/event-strategies/delete-event-strategy.ts +++ b/src/handlers/event-strategies/delete-event-strategy.ts @@ -32,16 +32,10 @@ export class DeleteEventStrategy implements IEventStrategy> ) if (eventIdsToDelete.length) { - const count = await this.eventRepository.deleteByPubkeyAndIds( + await this.eventRepository.deleteByPubkeyAndIds( event.pubkey, eventIdsToDelete ) - if (!count) { - await this.eventRepository.insertStubs( - event.pubkey, - eventIdsToDelete, - ) - } } const count = await this.eventRepository.create(event) diff --git a/src/handlers/request-handlers/get-invoice-request-handler.ts b/src/handlers/request-handlers/get-invoice-request-handler.ts deleted file mode 100644 index 52941a8e..00000000 --- a/src/handlers/request-handlers/get-invoice-request-handler.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NextFunction, Request, Response } from 'express' -import { path, pathEq } from 'ramda' -import { readFileSync } from 'fs' - -import { createSettings } from '../../factories/settings-factory' -import { FeeSchedule } from '../../@types/settings' - -let pageCache: string - -export const getInvoiceRequestHandler = (_req: Request, res: Response, next: NextFunction) => { - const settings = createSettings() - - if (pathEq(['payments', 'enabled'], true, settings) - && pathEq(['payments', 'feeSchedules', 'admission', '0', 'enabled'], true, settings)) { - if (!pageCache) { - const name = path(['info', 'name'])(settings) - const feeSchedule = path(['payments', 'feeSchedules', 'admission', '0'], settings) - pageCache = readFileSync('./resources/index.html', 'utf8') - .replaceAll('{{name}}', name) - .replaceAll('{{amount}}', (BigInt(feeSchedule.amount) / 1000n).toString()) - } - - res.status(200).setHeader('content-type', 'text/html; charset=utf8').send(pageCache) - } else { - res.status(404).send() - } - - next() -} diff --git a/src/handlers/request-handlers/get-invoice-status-request-handler.ts b/src/handlers/request-handlers/get-invoice-status-request-handler.ts deleted file mode 100644 index 76393e9f..00000000 --- a/src/handlers/request-handlers/get-invoice-status-request-handler.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Request, Response } from 'express' - -import { createGetInvoiceStatusController } from '../../factories/get-invoice-status-controller-factory' - -export const getInvoiceStatusRequestHandler = async (req: Request, res: Response) => { - const controller = createGetInvoiceStatusController() - - await controller.handleRequest(req, res) -} diff --git a/src/handlers/request-handlers/nodeinfo-handler.ts b/src/handlers/request-handlers/nodeinfo-handler.ts new file mode 100644 index 00000000..0a2ebf73 --- /dev/null +++ b/src/handlers/request-handlers/nodeinfo-handler.ts @@ -0,0 +1,40 @@ +import { NextFunction, Request, Response } from 'express' +import packageJson from '../../../package.json' + +export const nodeinfoHandler = (req: Request, res: Response, next: NextFunction) => { + res.json({ + links: [{ + rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0', + href: `https://${req.hostname}/nodeinfo/2.0`, + }, { + rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1', + href: `https://${req.hostname}/nodeinfo/2.1`, + }], + }).send() + next() +} + +export const nodeinfo21Handler = (_req: Request, res: Response, next: NextFunction) => { + res.json({ + version: '2.1', + software: { + name: 'nostream', + version: packageJson.version, + repository: packageJson.repository.url, + homepage: packageJson.homepage, + }, + protocols: ['nostr'], + services: { + inbound: [], + outbound: [], + }, + openRegistrations: true, + usage: { + users: {}, + }, + metadata: { + features: ['nostr_relay'], + }, + }).send() + next() +} \ No newline at end of file diff --git a/src/handlers/request-handlers/post-invoice-request-handler.ts b/src/handlers/request-handlers/post-invoice-request-handler.ts deleted file mode 100644 index c0f8d6a8..00000000 --- a/src/handlers/request-handlers/post-invoice-request-handler.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Request, Response } from 'express' -import { createPostInvoiceController } from '../../factories/post-invoice-controller-factory' - -export const postInvoiceRequestHandler = async ( - req: Request, - res: Response, -) => { - const controller = createPostInvoiceController() - - try { - await controller.handleRequest(req, res) - } catch (error) { - console.error('Unable handle request.', error) - res - .status(500) - .setHeader('content-type', 'text-plain') - .send('Error handling request') - } -} diff --git a/src/handlers/request-handlers/post-lnbits-callback-request-handler.ts b/src/handlers/request-handlers/post-lnbits-callback-request-handler.ts deleted file mode 100644 index 4cc152cc..00000000 --- a/src/handlers/request-handlers/post-lnbits-callback-request-handler.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Request, Response } from 'express' - -import { createLNbitsCallbackController } from '../../factories/lnbits-callback-controller-factory' - -export const postLNbitsCallbackRequestHandler = async ( - req: Request, - res: Response, -) => { - const controller = createLNbitsCallbackController() - - try { - await controller.handleRequest(req, res) - } catch (error) { - console.error('error while handling LNbits request: %o', error) - res - .status(500) - .setHeader('content-type', 'text/plain') - .send('Error handling request') - } -} diff --git a/src/handlers/request-handlers/post-zebedee-callback-request-handler.ts b/src/handlers/request-handlers/post-zebedee-callback-request-handler.ts deleted file mode 100644 index 1bff98b2..00000000 --- a/src/handlers/request-handlers/post-zebedee-callback-request-handler.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Request, Response } from 'express' -import { createZebedeeCallbackController } from '../../factories/zebedee-callback-controller-factory' - -export const postZebedeeCallbackRequestHandler = async ( - req: Request, - res: Response, -) => { - const controller = createZebedeeCallbackController() - - try { - await controller.handleRequest(req, res) - } catch (error) { - res - .status(500) - .setHeader('content-type', 'text-plain') - .send('Error handling request') - } -} diff --git a/src/handlers/request-handlers/rate-limiter-middleware.ts b/src/handlers/request-handlers/rate-limiter-middleware.ts index 86c2e837..aac85229 100644 --- a/src/handlers/request-handlers/rate-limiter-middleware.ts +++ b/src/handlers/request-handlers/rate-limiter-middleware.ts @@ -12,7 +12,7 @@ export const rateLimiterMiddleware = async (request: Request, response: Response const clientAddress = getRemoteAddress(request, currentSettings).split(',')[0] - debug('request received from %s: %O', clientAddress, request.headers) + debug('request received from %s: %o', clientAddress, request.headers) if (await isRateLimited(clientAddress, currentSettings)) { response.destroy() diff --git a/src/handlers/request-handlers/root-request-handler.ts b/src/handlers/request-handlers/root-request-handler.ts index dc0073b1..0e88bb8d 100644 --- a/src/handlers/request-handlers/root-request-handler.ts +++ b/src/handlers/request-handlers/root-request-handler.ts @@ -3,6 +3,7 @@ import { path } from 'ramda' import { createSettings } from '../../factories/settings-factory' import { FeeSchedule } from '../../@types/settings' +import { fromBech32 } from '../../utils/transform' import packageJson from '../../../package.json' export const rootRequestHandler = (request: Request, response: Response, next: NextFunction) => { @@ -10,13 +11,19 @@ export const rootRequestHandler = (request: Request, response: Response, next: N if (request.header('accept') === 'application/nostr+json') { const { - info: { name, description, pubkey, contact, relay_url }, + info: { name, description, pubkey: rawPubkey, contact, relay_url }, } = settings const paymentsUrl = new URL(relay_url) paymentsUrl.protocol = paymentsUrl.protocol === 'wss:' ? 'https:' : 'http:' paymentsUrl.pathname = '/invoices' + const content = settings.limits?.event?.content + + const pubkey = rawPubkey.startsWith('npub1') + ? fromBech32(rawPubkey) + : rawPubkey + const relayInformationDocument = { name, description, @@ -29,12 +36,14 @@ export const rootRequestHandler = (request: Request, response: Response, next: N limitation: { max_message_length: settings.network.maxPayloadSize, max_subscriptions: settings.limits?.client?.subscription?.maxSubscriptions, - max_filters: settings.limits?.client?.subscription?.maxFilters, - max_limit: 5000, - max_subid_length: 256, - min_prefix: 4, + max_filters: settings.limits?.client?.subscription?.maxFilterValues, + max_limit: settings.limits?.client?.subscription?.maxLimit, + max_subid_length: settings.limits?.client?.subscription?.maxSubscriptionIdLength, + min_prefix: settings.limits?.client?.subscription?.minPrefixLength, max_event_tags: 2500, - max_content_length: 102400, + max_content_length: Array.isArray(content) + ? content[0].maxLength // best guess since we have per-kind limits + : content?.maxLength, min_pow_difficulty: settings.limits?.event?.eventId?.minLeadingZeroBits, auth_required: false, payment_required: settings.payments?.enabled, diff --git a/src/handlers/request-handlers/with-controller-request-handler.ts b/src/handlers/request-handlers/with-controller-request-handler.ts new file mode 100644 index 00000000..52f55ebc --- /dev/null +++ b/src/handlers/request-handlers/with-controller-request-handler.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express' + +import { Factory } from '../../@types/base' +import { IController } from '../../@types/controllers' + +export const withController = (controllerFactory: Factory) => async ( + request: Request, + response: Response, +) => { + try { + return await controllerFactory().handleRequest(request, response) + } catch (error) { + response + .status(500) + .setHeader('content-type', 'text/plain') + .send('Error handling request') + } +} diff --git a/src/handlers/subscribe-message-handler.ts b/src/handlers/subscribe-message-handler.ts index abb47ec3..1ab4e322 100644 --- a/src/handlers/subscribe-message-handler.ts +++ b/src/handlers/subscribe-message-handler.ts @@ -87,23 +87,33 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable { private canSubscribe(subscriptionId: SubscriptionId, filters: SubscriptionFilter[]): string | undefined { const subscriptions = this.webSocket.getSubscriptions() const existingSubscription = subscriptions.get(subscriptionId) + const subscriptionLimits = this.settings().limits?.client?.subscription if (existingSubscription?.length && equals(filters, existingSubscription)) { - return `Duplicate subscription ${subscriptionId}: Ignorning` + return `Duplicate subscription ${subscriptionId}: Ignoring` } - const maxSubscriptions = this.settings().limits?.client?.subscription?.maxSubscriptions ?? 0 + const maxSubscriptions = subscriptionLimits?.maxSubscriptions ?? 0 if (maxSubscriptions > 0 && !existingSubscription?.length && subscriptions.size + 1 > maxSubscriptions ) { return `Too many subscriptions: Number of subscriptions must be less than or equal to ${maxSubscriptions}` } - const maxFilters = this.settings().limits?.client?.subscription?.maxFilters ?? 0 + const maxFilters = subscriptionLimits?.maxFilters ?? 0 if (maxFilters > 0) { if (filters.length > maxFilters) { return `Too many filters: Number of filters per susbscription must be less then or equal to ${maxFilters}` } } + + if ( + typeof subscriptionLimits.maxSubscriptionIdLength === 'number' + && subscriptionId.length > subscriptionLimits.maxSubscriptionIdLength + ) { + return `Subscription ID too long: Subscription ID must be less or equal to ${subscriptionLimits.maxSubscriptionIdLength}` + } + + } } diff --git a/src/payments-processors/lnbits-payment-processor.ts b/src/payments-processors/lnbits-payment-processor.ts index 6996c083..fc70aa6a 100644 --- a/src/payments-processors/lnbits-payment-processor.ts +++ b/src/payments-processors/lnbits-payment-processor.ts @@ -39,7 +39,7 @@ export class LNbitsCreateInvoiceResponse implements CreateInvoiceResponse { rawResponse?: string } -export class LNbitsPaymentsProcesor implements IPaymentsProcessor { +export class LNbitsPaymentsProcessor implements IPaymentsProcessor { public constructor( private httpClient: AxiosInstance, private settings: Factory diff --git a/src/payments-processors/lnurl-payments-processor.ts b/src/payments-processors/lnurl-payments-processor.ts new file mode 100644 index 00000000..30fe6420 --- /dev/null +++ b/src/payments-processors/lnurl-payments-processor.ts @@ -0,0 +1,70 @@ +import { AxiosInstance } from 'axios' +import { Factory } from '../@types/base' + +import { CreateInvoiceRequest, GetInvoiceResponse, IPaymentsProcessor } from '../@types/clients' +import { InvoiceStatus, InvoiceUnit, LnurlInvoice } from '../@types/invoice' +import { createLogger } from '../factories/logger-factory' +import { randomUUID } from 'crypto' +import { Settings } from '../@types/settings' + +const debug = createLogger('lnurl-payments-processor') + +export class LnurlPaymentsProcessor implements IPaymentsProcessor { + public constructor( + private httpClient: AxiosInstance, + private settings: Factory + ) {} + + public async getInvoice(invoice: LnurlInvoice): Promise { + debug('get invoice: %s', invoice.id) + + try { + const response = await this.httpClient.get(invoice.verifyURL) + + return { + id: invoice.id, + confirmedAt: response.data.settled ? new Date() : undefined, + status: response.data.settled ? InvoiceStatus.COMPLETED : InvoiceStatus.PENDING, + } + } catch (error) { + console.error(`Unable to get invoice ${invoice.id}. Reason:`, error) + + throw error + } + } + + public async createInvoice(request: CreateInvoiceRequest): Promise { + debug('create invoice: %o', request) + const { + amount: amountMsats, + description, + requestId, + } = request + + try { + const response = await this.httpClient.get(`${this.settings().paymentsProcessors?.lnurl?.invoiceURL}/callback?amount=${amountMsats}&comment=${description}`) + + const result = { + id: randomUUID(), + pubkey: requestId, + bolt11: response.data.pr, + amountRequested: amountMsats, + description, + unit: InvoiceUnit.MSATS, + status: InvoiceStatus.PENDING, + expiresAt: null, + confirmedAt: null, + createdAt: new Date(), + verifyURL: response.data.verify, + } + + debug('result: %o', result) + + return result + } catch (error) { + console.error('Unable to request invoice. Reason:', error.message) + + throw error + } + } +} diff --git a/src/payments-processors/nodeless-payments-processor.ts b/src/payments-processors/nodeless-payments-processor.ts new file mode 100644 index 00000000..c9a78e15 --- /dev/null +++ b/src/payments-processors/nodeless-payments-processor.ts @@ -0,0 +1,78 @@ +import { AxiosInstance } from 'axios' +import { Factory } from '../@types/base' + +import { CreateInvoiceRequest, CreateInvoiceResponse, GetInvoiceResponse, IPaymentsProcessor } from '../@types/clients' +import { createLogger } from '../factories/logger-factory' +import { fromNodelessInvoice } from '../utils/transform' +import { Settings } from '../@types/settings' + +const debug = createLogger('nodeless-payments-processor') + +export class NodelessPaymentsProcessor implements IPaymentsProcessor { + public constructor( + private httpClient: AxiosInstance, + private settings: Factory + ) {} + + public async getInvoice(invoiceId: string): Promise { + debug('get invoice: %s', invoiceId) + + const { storeId } = this.settings().paymentsProcessors.nodeless + + try { + const response = await this.httpClient.get(`/api/v1/store/${storeId}/invoice/${invoiceId}`, { + maxRedirects: 1, + }) + + return fromNodelessInvoice(response.data.data) + } catch (error) { + console.error(`Unable to get invoice ${invoiceId}. Reason:`, error) + + throw error + } + } + + public async createInvoice(request: CreateInvoiceRequest): Promise { + debug('create invoice: %O', request) + const { + amount: amountMsats, + description, + requestId, + } = request + + const amountSats = Number(amountMsats / 1000n) + + const body = { + amount: amountSats, + currency: 'SATS', + metadata: { + description, + requestId, + unit: 'sats', + createdAt: new Date().toISOString(), + }, + } + + const { storeId } = this.settings().paymentsProcessors.nodeless + + try { + debug('request body: %O', body) + const response = await this.httpClient.post(`/api/v1/store/${storeId}/invoice`, body, { + maxRedirects: 1, + }) + + debug('response headers: %O', response.headers) + debug('response data: %O', response.data) + + const result = fromNodelessInvoice(response.data.data) + + debug('invoice: %O', result) + + return result + } catch (error) { + console.error('Unable to request invoice. Reason:', error.message) + + throw error + } + } +} diff --git a/src/payments-processors/null-payments-processor.ts b/src/payments-processors/null-payments-processor.ts index 69f9f6df..9e5b4a9f 100644 --- a/src/payments-processors/null-payments-processor.ts +++ b/src/payments-processors/null-payments-processor.ts @@ -16,6 +16,7 @@ export class NullPaymentsProcessor implements IPaymentsProcessor { confirmedAt: null, createdAt: date, updatedAt: date, + verifyURL: '', } } @@ -32,6 +33,7 @@ export class NullPaymentsProcessor implements IPaymentsProcessor { rawResponse: '', confirmedAt: null, createdAt: new Date(), + verifyURL: '', } } } diff --git a/src/payments-processors/opennode-payments-processor.ts b/src/payments-processors/opennode-payments-processor.ts new file mode 100644 index 00000000..4c006d90 --- /dev/null +++ b/src/payments-processors/opennode-payments-processor.ts @@ -0,0 +1,68 @@ +import { AxiosInstance } from 'axios' +import { Factory } from '../@types/base' + +import { CreateInvoiceRequest, CreateInvoiceResponse, GetInvoiceResponse, IPaymentsProcessor } from '../@types/clients' +import { createLogger } from '../factories/logger-factory' +import { fromOpenNodeInvoice } from '../utils/transform' +import { Settings } from '../@types/settings' + +const debug = createLogger('opennode-payments-processor') + +export class OpenNodePaymentsProcessor implements IPaymentsProcessor { + public constructor( + private httpClient: AxiosInstance, + private settings: Factory + ) {} + + public async getInvoice(invoiceId: string): Promise { + debug('get invoice: %s', invoiceId) + + try { + const response = await this.httpClient.get(`/v2/charge/${invoiceId}`, { + maxRedirects: 1, + }) + + return fromOpenNodeInvoice(response.data.data) + } catch (error) { + console.error(`Unable to get invoice ${invoiceId}. Reason:`, error) + + throw error + } + } + + public async createInvoice(request: CreateInvoiceRequest): Promise { + debug('create invoice: %o', request) + const { + amount: amountMsats, + description, + requestId, + } = request + + const amountSats = Number(amountMsats / 1000n) + + const body = { + amount: amountSats, + description, + order_id: requestId, + callback_url: this.settings().paymentsProcessors?.opennode?.callbackBaseURL, + ttl: 10, + } + + try { + debug('request body: %o', body) + const response = await this.httpClient.post('/v1/charges', body, { + maxRedirects: 1, + }) + + const result = fromOpenNodeInvoice(response.data.data) + + debug('result: %o', result) + + return result + } catch (error) { + console.error('Unable to request invoice. Reason:', error.message) + + throw error + } + } +} diff --git a/src/payments-processors/payments-procesor.ts b/src/payments-processors/payments-procesor.ts deleted file mode 100644 index ad64f489..00000000 --- a/src/payments-processors/payments-procesor.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { CreateInvoiceRequest, CreateInvoiceResponse, IPaymentsProcessor } from '../@types/clients' -import { Invoice } from '../@types/invoice' - -export class PaymentsProcessor implements IPaymentsProcessor { - public constructor( - private readonly processor: IPaymentsProcessor - ) {} - - public async getInvoice(invoiceId: string): Promise { - return this.processor.getInvoice(invoiceId) - } - - public async createInvoice(request: CreateInvoiceRequest): Promise { - return this.processor.createInvoice(request) - } -} diff --git a/src/payments-processors/zebedee-payments-processor.ts b/src/payments-processors/zebedee-payments-processor.ts index 1b8339db..d24427bd 100644 --- a/src/payments-processors/zebedee-payments-processor.ts +++ b/src/payments-processors/zebedee-payments-processor.ts @@ -8,7 +8,7 @@ import { Settings } from '../@types/settings' const debug = createLogger('zebedee-payments-processor') -export class ZebedeePaymentsProcesor implements IPaymentsProcessor { +export class ZebedeePaymentsProcessor implements IPaymentsProcessor { public constructor( private httpClient: AxiosInstance, private settings: Factory diff --git a/src/repositories/event-repository.ts b/src/repositories/event-repository.ts index f871ce35..9c645b8a 100644 --- a/src/repositories/event-repository.ts +++ b/src/repositories/event-repository.ts @@ -10,7 +10,6 @@ import { forEach, forEachObjIndexed, groupBy, - identity, ifElse, invoker, is, @@ -29,7 +28,7 @@ import { toPairs, } from 'ramda' -import { ContextMetadataKey, EventDeduplicationMetadataKey, EventDelegatorMetadataKey, EventExpirationTimeMetadataKey } from '../constants/base' +import { ContextMetadataKey, EventDeduplicationMetadataKey, EventExpirationTimeMetadataKey } from '../constants/base' import { DatabaseClient, EventId } from '../@types/base' import { DBEvent, Event } from '../@types/event' import { IEventRepository, IQueryResult } from '../@types/repositories' @@ -106,7 +105,7 @@ export class EventRepository implements IEventRepository { ])(currentFilter[filterName] as string[]) }) })({ - authors: ['event_pubkey', 'event_delegator'], + authors: ['event_pubkey'], ids: ['event_id'], }) @@ -131,19 +130,19 @@ export class EventRepository implements IEventRepository { const andWhereRaw = invoker(1, 'andWhereRaw') const orWhereRaw = invoker(2, 'orWhereRaw') + let isTagQuery = false pipe( toPairs, filter(pipe(nth(0) as () => string, isGenericTagQuery)) as any, forEach(([filterName, criteria]: [string, string[]]) => { + isTagQuery = true builder.andWhere((bd) => { ifElse( isEmpty, () => andWhereRaw('1 = 0', bd), forEach((criterion: string) => void orWhereRaw( - '"event_tags" @> ?', - [ - JSON.stringify([[filterName[1], criterion]]) as any, - ], + 'event_tags.tag_name = ? AND event_tags.tag_value = ?', + [filterName[1], criterion], bd, )), )(criteria) @@ -151,6 +150,11 @@ export class EventRepository implements IEventRepository { }), )(currentFilter as any) + if (isTagQuery) { + builder.leftJoin('event_tags', 'events.event_id', 'event_tags.event_id') + .select('events.*') + } + return builder }) @@ -176,18 +180,12 @@ export class EventRepository implements IEventRepository { event_tags: pipe(prop('tags'), toJSON), event_content: prop('content'), event_signature: pipe(prop('sig'), toBuffer), - event_delegator: ifElse( - propSatisfies(is(String), EventDelegatorMetadataKey), - pipe(prop(EventDelegatorMetadataKey as any), toBuffer), - always(null), - ), remote_address: path([ContextMetadataKey as any, 'remoteAddress', 'address']), expires_at: ifElse( propSatisfies(is(Number), EventExpirationTimeMetadataKey), - prop(EventExpirationTimeMetadataKey as any), + prop(EventExpirationTimeMetadataKey as any), always(null), ), - })(event) return this.masterDbClient('events') @@ -209,11 +207,6 @@ export class EventRepository implements IEventRepository { event_tags: pipe(prop('tags'), toJSON), event_content: prop('content'), event_signature: pipe(prop('sig'), toBuffer), - event_delegator: ifElse( - propSatisfies(is(String), EventDelegatorMetadataKey), - pipe(prop(EventDelegatorMetadataKey as any), toBuffer), - always(null), - ), event_deduplication: ifElse( propSatisfies(isNil, EventDeduplicationMetadataKey), pipe(paths([['pubkey'], ['kind']]), toJSON), @@ -225,6 +218,7 @@ export class EventRepository implements IEventRepository { prop(EventExpirationTimeMetadataKey as any), always(null), ), + deleted_at: always(null), })(event) const query = this.masterDbClient('events') @@ -246,30 +240,6 @@ export class EventRepository implements IEventRepository { } as Promise } - public insertStubs(pubkey: string, eventIdsToDelete: EventId[]): Promise { - debug('inserting stubs for %s: %o', pubkey, eventIdsToDelete) - const date = new Date() - return this.masterDbClient('events').insert( - eventIdsToDelete.map( - applySpec({ - event_id: pipe(identity, toBuffer), - event_pubkey: pipe(always(pubkey), toBuffer), - event_created_at: always(Math.floor(date.getTime() / 1000)), - event_kind: always(5), - event_tags: always('[]'), - event_content: always(''), - event_signature: pipe(always(''), toBuffer), - event_delegator: always(null), - event_deduplication: pipe(always([pubkey, 5]), toJSON), - expires_at: always(null), - deleted_at: always(date.toISOString()), - }) - ) - ) - .onConflict() - .ignore() as Promise - } - public deleteByPubkeyAndIds(pubkey: string, eventIdsToDelete: EventId[]): Promise { debug('deleting events from %s: %o', pubkey, eventIdsToDelete) diff --git a/src/repositories/invoice-repository.ts b/src/repositories/invoice-repository.ts index e493c425..922e69be 100644 --- a/src/repositories/invoice-repository.ts +++ b/src/repositories/invoice-repository.ts @@ -1,9 +1,10 @@ import { always, applySpec, + head, ifElse, is, - isNil, + map, omit, pipe, prop, @@ -76,6 +77,31 @@ export class InvoiceRepository implements IInvoiceRepository { return dbInvoices.map(fromDBInvoice) } + public updateStatus( + invoice: Invoice, + client: DatabaseClient = this.dbClient, + ): Promise { + debug('updating invoice status: %o', invoice) + + const query = client('invoices') + .update({ + status: invoice.status, + updated_at: new Date(), + }) + .where('id', invoice.id) + .limit(1) + .returning(['*']) + + return { + then: ( + onfulfilled: (value: Invoice | undefined) => T1 | PromiseLike, + onrejected: (reason: any) => T2 | PromiseLike + ) => query.then(pipe(map(fromDBInvoice), head)).then(onfulfilled, onrejected), + catch: (onrejected: (reason: any) => T | PromiseLike) => query.catch(onrejected), + toString: (): string => query.toString(), + } as Promise + } + public upsert( invoice: Invoice, client: DatabaseClient = this.dbClient @@ -92,17 +118,10 @@ export class InvoiceRepository implements IInvoiceRepository { status: prop('status'), description: prop('description'), // confirmed_at: prop('confirmedAt'), - expires_at: ifElse( - propSatisfies(isNil, 'expiresAt'), - always(undefined), - prop('expiresAt'), - ), + expires_at: prop('expiresAt'), updated_at: always(new Date()), - created_at: ifElse( - propSatisfies(isNil, 'createdAt'), - always(undefined), - prop('createdAt'), - ), + created_at: prop('createdAt'), + verify_url: prop('verifyURL'), })(invoice) debug('row: %o', row) @@ -120,6 +139,7 @@ export class InvoiceRepository implements IInvoiceRepository { 'description', 'expires_at', 'created_at', + 'verify_url', ])(row) ) diff --git a/src/routes/admissions/index.ts b/src/routes/admissions/index.ts new file mode 100644 index 00000000..8e63fb89 --- /dev/null +++ b/src/routes/admissions/index.ts @@ -0,0 +1,10 @@ +import { createGetAdmissionCheckController } from '../../factories/controllers/get-admission-check-controller-factory' +import { Router } from 'express' +import { withController } from '../../handlers/request-handlers/with-controller-request-handler' + +const admissionRouter = Router() + +admissionRouter + .get('/check/:pubkey', withController(createGetAdmissionCheckController)) + +export default admissionRouter \ No newline at end of file diff --git a/src/routes/callbacks/index.ts b/src/routes/callbacks/index.ts index 0beeca12..5b86e0bf 100644 --- a/src/routes/callbacks/index.ts +++ b/src/routes/callbacks/index.ts @@ -1,73 +1,21 @@ -import { deriveFromSecret, hmacSha256 } from '../../utils/secret' import { json, Router } from 'express' -import { createLogger } from '../../factories/logger-factory' -import { createSettings } from '../../factories/settings-factory' -import { getRemoteAddress } from '../../utils/http' -import { postLNbitsCallbackRequestHandler } from '../../handlers/request-handlers/post-lnbits-callback-request-handler' -import { postZebedeeCallbackRequestHandler } from '../../handlers/request-handlers/post-zebedee-callback-request-handler' - -const debug = createLogger('routes-callbacks') +import { createLNbitsCallbackController } from '../../factories/controllers/lnbits-callback-controller-factory' +import { createNodelessCallbackController } from '../../factories/controllers/nodeless-callback-controller-factory' +import { createOpenNodeCallbackController } from '../../factories/controllers/opennode-callback-controller-factory' +import { createZebedeeCallbackController } from '../../factories/controllers/zebedee-callback-controller-factory' +import { withController } from '../../handlers/request-handlers/with-controller-request-handler' const router = Router() -router - .post('/zebedee', json(), (req, res) => { - const settings = createSettings() - const { ipWhitelist = [] } = settings.paymentsProcessors?.zebedee ?? {} - const remoteAddress = getRemoteAddress(req, settings) - const paymentProcessor = settings.payments?.processor ?? 'null' - - if (ipWhitelist.length && !ipWhitelist.includes(remoteAddress)) { - debug('unauthorized request from %s to /callbacks/zebedee', remoteAddress) - res - .status(403) - .send('Forbidden') - return - } - - if (paymentProcessor !== 'zebedee') { - debug('denied request from %s to /callbacks/zebedee which is not the current payment processor', remoteAddress) - res - .status(403) - .send('Forbidden') - return - } - - postZebedeeCallbackRequestHandler(req, res) - }) - .post('/lnbits', json(), (req, res) => { - const settings = createSettings() - const remoteAddress = getRemoteAddress(req, settings) - const paymentProcessor = settings.payments?.processor ?? 'null' - if (paymentProcessor !== 'lnbits') { - debug('denied request from %s to /callbacks/lnbits which is not the current payment processor', remoteAddress) - res - .status(403) - .send('Forbidden') - return - } - - let validationPassed = false - - if (typeof req.query.hmac === 'string' && req.query.hmac.match(/^[0-9]{1,20}:[0-9a-f]{64}$/)) { - const split = req.query.hmac.split(':') - if (hmacSha256(deriveFromSecret('lnbits-callback-hmac-key'), split[0]).toString('hex') === split[1]) { - if (parseInt(split[0]) > Date.now()) { - validationPassed = true - } - } - } - - if (!validationPassed) { - debug('unauthorized request from %s to /callbacks/lnbits', remoteAddress) - res - .status(403) - .send('Forbidden') - return - } - postLNbitsCallbackRequestHandler(req, res) - }) +router + .post('/zebedee', json(), withController(createZebedeeCallbackController)) + .post('/lnbits', json(), withController(createLNbitsCallbackController)) + .post('/nodeless', json({ + verify(req, _res, buf) { + (req as any).rawBody = buf + }, + }), withController(createNodelessCallbackController)) + .post('/opennode', json(), withController(createOpenNodeCallbackController)) export default router - diff --git a/src/routes/index.ts b/src/routes/index.ts index 2c1e963f..0e291f94 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -1,5 +1,7 @@ import express from 'express' +import { nodeinfo21Handler, nodeinfoHandler } from '../handlers/request-handlers/nodeinfo-handler' +import admissionRouter from './admissions' import callbacksRouter from './callbacks' import { getHealthRequestHandler } from '../handlers/request-handlers/get-health-request-handler' import { getTermsRequestHandler } from '../handlers/request-handlers/get-terms-request-handler' @@ -13,7 +15,12 @@ router.get('/', rootRequestHandler) router.get('/healthz', getHealthRequestHandler) router.get('/terms', getTermsRequestHandler) +router.get('/.well-known/nodeinfo', nodeinfoHandler) +router.get('/nodeinfo/2.1', nodeinfo21Handler) +router.get('/nodeinfo/2.0', nodeinfo21Handler) + router.use('/invoices', rateLimiterMiddleware, invoiceRouter) +router.use('/admissions', rateLimiterMiddleware, admissionRouter) router.use('/callbacks', rateLimiterMiddleware, callbacksRouter) export default router diff --git a/src/routes/invoices/index.ts b/src/routes/invoices/index.ts index 23a33986..beefa741 100644 --- a/src/routes/invoices/index.ts +++ b/src/routes/invoices/index.ts @@ -1,14 +1,15 @@ import { Router, urlencoded } from 'express' -import { getInvoiceRequestHandler } from '../../handlers/request-handlers/get-invoice-request-handler' -import { getInvoiceStatusRequestHandler } from '../../handlers/request-handlers/get-invoice-status-request-handler' -import { postInvoiceRequestHandler } from '../../handlers/request-handlers/post-invoice-request-handler' +import { createGetInvoiceController } from '../../factories/controllers/get-invoice-controller-factory' +import { createGetInvoiceStatusController } from '../../factories/controllers/get-invoice-status-controller-factory' +import { createPostInvoiceController } from '../../factories/controllers/post-invoice-controller-factory' +import { withController } from '../../handlers/request-handlers/with-controller-request-handler' const invoiceRouter = Router() invoiceRouter - .get('/', getInvoiceRequestHandler) - .get('/:invoiceId/status', getInvoiceStatusRequestHandler) - .post('/', urlencoded({ extended: true }), postInvoiceRequestHandler) + .get('/', withController(createGetInvoiceController)) + .get('/:invoiceId/status', withController(createGetInvoiceStatusController)) + .post('/', urlencoded({ extended: true }), withController(createPostInvoiceController)) -export default invoiceRouter +export default invoiceRouter \ No newline at end of file diff --git a/src/schemas/base-schema.ts b/src/schemas/base-schema.ts index 334ebdd8..2df3e3f5 100644 --- a/src/schemas/base-schema.ts +++ b/src/schemas/base-schema.ts @@ -10,7 +10,7 @@ export const kindSchema = Schema.number().min(0).multiple(1).label('kind') export const signatureSchema = Schema.string().case('lower').hex().length(128).label('sig') -export const subscriptionSchema = Schema.string().min(1).max(255).label('subscriptionId') +export const subscriptionSchema = Schema.string().min(1).label('subscriptionId') const seconds = (value: any, helpers: any) => (Number.isSafeInteger(value) && Math.log10(value) < 10) ? value : helpers.error('any.invalid') @@ -18,7 +18,6 @@ export const createdAtSchema = Schema.number().min(0).multiple(1).custom(seconds // [, 0..*] export const tagSchema = Schema.array() - .ordered(Schema.string().max(255).required().label('identifier')) - .items(Schema.string().allow('').max(1024).label('value')) - .max(10) + .ordered(Schema.string().required().label('identifier')) + .items(Schema.string().allow('').label('value')) .label('tag') diff --git a/src/schemas/event-schema.ts b/src/schemas/event-schema.ts index 10141020..fab6520b 100644 --- a/src/schemas/event-schema.ts +++ b/src/schemas/event-schema.ts @@ -31,10 +31,9 @@ export const eventSchema = Schema.object({ pubkey: pubkeySchema.required(), created_at: createdAtSchema.required(), kind: kindSchema.required(), - tags: Schema.array().items(tagSchema).max(2500).required(), + tags: Schema.array().items(tagSchema).required(), content: Schema.string() .allow('') - .max(100 * 1024) // 100 kB .required(), sig: signatureSchema.required(), }).unknown(false) diff --git a/src/schemas/filter-schema.ts b/src/schemas/filter-schema.ts index 1fd2fed9..f67453f2 100644 --- a/src/schemas/filter-schema.ts +++ b/src/schemas/filter-schema.ts @@ -3,10 +3,10 @@ import Schema from 'joi' import { createdAtSchema, kindSchema, prefixSchema } from './base-schema' export const filterSchema = Schema.object({ - ids: Schema.array().items(prefixSchema.label('prefixOrId')).max(1000), - authors: Schema.array().items(prefixSchema.label('prefixOrAuthor')).max(1000), - kinds: Schema.array().items(kindSchema).max(20), + ids: Schema.array().items(prefixSchema.label('prefixOrId')), + authors: Schema.array().items(prefixSchema.label('prefixOrAuthor')), + kinds: Schema.array().items(kindSchema), since: createdAtSchema, until: createdAtSchema, - limit: Schema.number().min(0).multiple(1).max(5000), -}).pattern(/^#[a-z]$/, Schema.array().items(Schema.string().max(1024)).max(256)) + limit: Schema.number().min(0).multiple(1), +}).pattern(/^#[a-z]$/, Schema.array().items(Schema.string().max(1024))) diff --git a/src/services/payments-service.ts b/src/services/payments-service.ts index e7c52273..3bbbe9e5 100644 --- a/src/services/payments-service.ts +++ b/src/services/payments-service.ts @@ -1,17 +1,16 @@ -import { andThen, pipe } from 'ramda' -import { broadcastEvent, encryptKind4Event, getPublicKey, getRelayPrivateKey, identifyEvent, signEvent } from '../utils/event' +import { andThen, otherwise, pipe } from 'ramda' +import { broadcastEvent, getPublicKey, getRelayPrivateKey, identifyEvent, signEvent } from '../utils/event' import { DatabaseClient, Pubkey } from '../@types/base' import { FeeSchedule, Settings } from '../@types/settings' import { IEventRepository, IInvoiceRepository, IUserRepository } from '../@types/repositories' import { Invoice, InvoiceStatus, InvoiceUnit } from '../@types/invoice' +import { Event, ExpiringEvent, UnidentifiedEvent } from '../@types/event' +import { EventExpirationTimeMetadataKey, EventKinds, EventTags } from '../constants/base' import { createLogger } from '../factories/logger-factory' -import { EventKinds } from '../constants/base' import { IPaymentsProcessor } from '../@types/clients' import { IPaymentsService } from '../@types/services' -import { toBech32 } from '../utils/transform' import { Transaction } from '../database/transaction' -import { UnidentifiedEvent } from '../@types/event' const debug = createLogger('payments-service') @@ -36,10 +35,11 @@ export class PaymentsService implements IPaymentsService { } } - public async getInvoiceFromPaymentsProcessor(invoiceId: string): Promise { - debug('get invoice %s from payment processor', invoiceId) + public async getInvoiceFromPaymentsProcessor(invoice: Invoice | string): Promise> { try { - return await this.paymentsProcessor.getInvoice(invoiceId) + return await this.paymentsProcessor.getInvoice( + typeof invoice === 'string' || invoice?.verifyURL ? invoice : invoice.id + ) } catch (error) { console.log('Unable to get invoice from payments processor. Reason:', error) @@ -52,7 +52,7 @@ export class PaymentsService implements IPaymentsService { amount: bigint, description: string, ): Promise { - debug('create invoice for %s for %s: %d', pubkey, amount.toString(), description) + debug('create invoice for %s for %s: %s', pubkey, amount.toString(), description) const transaction = new Transaction(this.dbClient) try { @@ -82,6 +82,7 @@ export class PaymentsService implements IPaymentsService { expiresAt: invoiceResponse.expiresAt, updatedAt: date, createdAt: date, + verifyURL: invoiceResponse.verifyURL, }, transaction.transaction, ) @@ -99,6 +100,7 @@ export class PaymentsService implements IPaymentsService { expiresAt: invoiceResponse.expiresAt, updatedAt: date, createdAt: invoiceResponse.createdAt, + verifyURL: invoiceResponse.verifyURL, } } catch (error) { await transaction.rollback() @@ -108,20 +110,12 @@ export class PaymentsService implements IPaymentsService { } } - public async updateInvoice(invoice: Invoice): Promise { + public async updateInvoice(invoice: Partial): Promise { debug('update invoice %s: %o', invoice.id, invoice) try { - await this.invoiceRepository.upsert({ + await this.invoiceRepository.updateStatus({ id: invoice.id, - pubkey: invoice.pubkey, - bolt11: invoice.bolt11, - amountRequested: invoice.amountRequested, - description: invoice.description, - unit: invoice.unit, status: invoice.status, - expiresAt: invoice.expiresAt, - updatedAt: new Date(), - createdAt: invoice.createdAt, }) } catch (error) { console.error('Unable to update invoice. Reason:', error) @@ -129,16 +123,26 @@ export class PaymentsService implements IPaymentsService { } } + public async updateInvoiceStatus(invoice: Pick): Promise { + debug('update invoice %s: %o', invoice.id, invoice) + try { + return await this.invoiceRepository.updateStatus(invoice) + } catch (error) { + console.error('Unable to update invoice. Reason:', error) + throw error + } + } + public async confirmInvoice( invoice: Invoice, ): Promise { - debug('confirm invoice %s: %o', invoice.id, invoice) + debug('confirm invoice %s: %O', invoice.id, invoice) const transaction = new Transaction(this.dbClient) try { if (!invoice.confirmedAt) { - throw new Error('Invoince confirmation date is not set') + throw new Error('Invoice confirmation date is not set') } if (invoice.status !== InvoiceStatus.COMPLETED) { throw new Error(`Invoice is not complete: ${invoice.status}`) @@ -201,68 +205,6 @@ export class PaymentsService implements IPaymentsService { } } - public async sendNewInvoiceNotification(invoice: Invoice): Promise { - debug('invoice created notification %s: %o', invoice.id, invoice) - const currentSettings = this.settings() - - const { - info: { - relay_url: relayUrl, - name: relayName, - }, - } = currentSettings - - const relayPrivkey = getRelayPrivateKey(relayUrl) - const relayPubkey = getPublicKey(relayPrivkey) - - let unit: string = invoice.unit - let amount: bigint = invoice.amountRequested - if (invoice.unit === InvoiceUnit.MSATS) { - amount /= 1000n - unit = 'sats' - } - - const url = new URL(relayUrl) - - const terms = new URL(relayUrl) - terms.protocol = ['https', 'wss'].includes(url.protocol) - ? 'https' - : 'http' - terms.pathname += 'terms' - - const unsignedInvoiceEvent: UnidentifiedEvent = { - pubkey: relayPubkey, - kind: EventKinds.ENCRYPTED_DIRECT_MESSAGE, - created_at: Math.floor(invoice.createdAt.getTime() / 1000), - content: `From: ${toBech32('npub')(relayPubkey)}@${url.hostname} (${relayName}) -To: ${toBech32('npub')(invoice.pubkey)}@${url.hostname} -🧾 Admission Fee Invoice - -Amount: ${amount.toString()} ${unit} - -⚠️ By paying this invoice, you confirm that you have read and agree to the Terms of Service: -${terms.toString()} -${invoice.expiresAt ? ` -⏳ Expires at ${invoice.expiresAt.toISOString()}` : ''} - -${invoice.bolt11}`, - tags: [ - ['p', invoice.pubkey], - ['bolt11', invoice.bolt11], - ], - } - - const persistEvent = this.eventRepository.create.bind(this.eventRepository) - - await pipe( - identifyEvent, - andThen(encryptKind4Event(relayPrivkey, invoice.pubkey)), - andThen(signEvent(relayPrivkey)), - andThen(broadcastEvent), - andThen(persistEvent), - )(unsignedInvoiceEvent) - } - public async sendInvoiceUpdateNotification(invoice: Invoice): Promise { debug('invoice updated notification %s: %o', invoice.id, invoice) const currentSettings = this.settings() @@ -270,7 +212,6 @@ ${invoice.bolt11}`, const { info: { relay_url: relayUrl, - name: relayName, }, } = currentSettings @@ -290,31 +231,36 @@ ${invoice.bolt11}`, unit = InvoiceUnit.SATS } - const url = new URL(relayUrl) + const now = new Date() + const expiration = new Date(now.getFullYear(), now.getMonth() + 1, now.getDate()) - const unsignedInvoiceEvent: UnidentifiedEvent = { + const unsignedInvoiceEvent: UnidentifiedEvent & Pick = { pubkey: relayPubkey, - kind: EventKinds.ENCRYPTED_DIRECT_MESSAGE, - created_at: Math.floor(invoice.createdAt.getTime() / 1000), - content: `🧾 Admission Fee Invoice Paid for ${relayPubkey}@${url.hostname} (${relayName}) - -Amount received: ${amount.toString()} ${unit} - -Thanks!`, + kind: EventKinds.INVOICE_UPDATE, + created_at: Math.floor(now.getTime() / 1000), + content: `Invoice paid: ${amount.toString()} ${unit}`, tags: [ - ['p', invoice.pubkey], - ['c', invoice.id], + [EventTags.Pubkey, invoice.pubkey], + [EventTags.Invoice, invoice.bolt11], + [EventTags.Expiration, Math.floor(expiration.getTime() / 1000).toString()], ], + [EventExpirationTimeMetadataKey]: expiration.getTime() / 1000, + } + + const persistEvent = async (event: Event) => { + await this.eventRepository.create(event) + + return event } - const persistEvent = this.eventRepository.create.bind(this.eventRepository) + const logError = (error: Error) => console.error('Unable to send notification', error) await pipe( identifyEvent, - andThen(encryptKind4Event(relayPrivkey, invoice.pubkey)), andThen(signEvent(relayPrivkey)), - andThen(broadcastEvent), andThen(persistEvent), + andThen(broadcastEvent), + otherwise(logError), )(unsignedInvoiceEvent) } } diff --git a/src/utils/event.ts b/src/utils/event.ts index 577bb478..9c4bafd5 100644 --- a/src/utils/event.ts +++ b/src/utils/event.ts @@ -1,6 +1,6 @@ import * as secp256k1 from '@noble/secp256k1' -import { applySpec, converge, curry, mergeLeft, nth, omit, pipe, prop, reduceBy } from 'ramda' +import { applySpec, pipe, prop } from 'ramda' import { CanonicalEvent, DBEvent, Event, UnidentifiedEvent, UnsignedEvent } from '../@types/event' import { createCipheriv, getRandomValues } from 'crypto' import { EventId, Pubkey, Tag } from '../@types/base' @@ -12,7 +12,6 @@ import { EventKindsRange } from '../@types/settings' import { fromBuffer } from './transform' import { getLeadingZeroBits } from './proof-of-work' import { isGenericTagQuery } from './filter' -import { RuneLike } from './runes/rune-like' import { SubscriptionFilter } from '../@types/subscription' import { WebSocketServerAdapterEvent } from '../constants/adapter' @@ -68,18 +67,7 @@ export const isEventMatchingFilter = (filter: SubscriptionFilter) => (event: Eve if ( !filter.authors.some(startsWith(event.pubkey)) ) { - if (isDelegatedEvent(event)) { - const delegation = event.tags.find((tag) => tag[0] === EventTags.Delegation) - if (typeof delegation === 'undefined') { - return false - } - - if (!filter.authors.some(startsWith(delegation[1]))) { - return false - } - } else { - return false - } + return false } } @@ -116,51 +104,6 @@ export const isEventMatchingFilter = (filter: SubscriptionFilter) => (event: Eve return true } -export const isDelegatedEvent = (event: Event): boolean => { - return event.tags.some((tag) => tag.length === 4 && tag[0] === EventTags.Delegation) -} - -export const isDelegatedEventValid = async (event: Event): Promise => { - const delegation = event.tags.find((tag) => tag.length === 4 && tag[0] === EventTags.Delegation) - if (!delegation) { - return false - } - - - // Validate rune - const runifiedEvent = (converge( - curry(mergeLeft), - [ - omit(['tags']), - pipe( - prop('tags') as any, - reduceBy( - (acc, tag) => ([...acc, tag[1]]), - [], - nth(0) as any, - ), - ), - ], - ) as any)(event) - - let result: boolean - try { - [result] = RuneLike.from(delegation[2]).test(runifiedEvent) - } catch (error) { - result = false - } - - if (!result) { - return false - } - - const serializedDelegationTag = `nostr:${delegation[0]}:${event.pubkey}:${delegation[2]}` - - const token = await secp256k1.utils.sha256(Buffer.from(serializedDelegationTag)) - - return secp256k1.schnorr.verify(delegation[3], token, delegation[1]) -} - export const getEventHash = async (event: Event | UnidentifiedEvent | UnsignedEvent): Promise => { const id = await secp256k1.utils.sha256(Buffer.from(JSON.stringify(serializeEvent(event)))) @@ -181,15 +124,33 @@ export const identifyEvent = async (event: UnidentifiedEvent): Promise Buffer.from(secp256k1.getPublicKey(privkey, true)).subarray(1).toString('hex') +const publicKeyCache: Record = {} +export const getPublicKey = (privkey: string) => { + if (privkey in publicKeyCache) { + return publicKeyCache[privkey] + } + + publicKeyCache[privkey] = secp256k1.utils.bytesToHex(secp256k1.getPublicKey(privkey, true).subarray(1)) + + return publicKeyCache[privkey] +} export const signEvent = (privkey: string | Buffer | undefined) => async (event: UnsignedEvent): Promise => { const sig = await secp256k1.schnorr.sign(event.id, privkey as any) @@ -267,16 +228,19 @@ export const isDeleteEvent = (event: Event): boolean => { } export const isExpiredEvent = (event: Event): boolean => { - if (!event.tags.length) return false + if (!event.tags.length) { + return false + } const expirationTime = getEventExpiration(event) - if (!expirationTime) return false + if (!expirationTime) { + return false + } - const date = new Date() - const isExpired = expirationTime <= Math.floor(date.getTime() / 1000) + const now = Math.floor(new Date().getTime() / 1000) - return isExpired + return expirationTime <= now } export const getEventExpiration = (event: Event): number | undefined => { @@ -284,7 +248,8 @@ export const getEventExpiration = (event: Event): number | undefined => { if (!rawExpirationTime) return const expirationTime = Number(rawExpirationTime) - if ((Number.isSafeInteger(expirationTime) && Math.log10(expirationTime))) { + + if ((Number.isSafeInteger(expirationTime) && Math.log10(expirationTime) < 10)) { return expirationTime } } diff --git a/src/utils/filter.ts b/src/utils/filter.ts index 916e5013..2e1d5c94 100644 --- a/src/utils/filter.ts +++ b/src/utils/filter.ts @@ -1 +1 @@ -export const isGenericTagQuery = (key: string) => /^#[a-z]$/.test(key) +export const isGenericTagQuery = (key: string) => /^#[a-zA-Z]$/.test(key) diff --git a/src/utils/secret.ts b/src/utils/secret.ts index 4260ec99..16b7fd28 100644 --- a/src/utils/secret.ts +++ b/src/utils/secret.ts @@ -1,11 +1,15 @@ import { createHmac } from 'crypto' export function deriveFromSecret(purpose: string | Buffer): Buffer { - return hmacSha256(process.env.SECRET as string, purpose) + if (!process.env.SECRET) { + throw new Error('SECRET environment variable not set') + } + + return hmacSha256(process.env.SECRET, purpose) } export function hmacSha256(secret: string | Buffer, data: string | Buffer): Buffer { - return createHmac('sha256', secret) - .update(data) - .digest() + return createHmac('sha256', secret) + .update(data) + .digest() } diff --git a/src/utils/settings.ts b/src/utils/settings.ts index 55092c33..e1708706 100644 --- a/src/utils/settings.ts +++ b/src/utils/settings.ts @@ -125,7 +125,7 @@ export class SettingsStatic { const settingsFilePath = join(basePath, `settings.${fileType}`) const reload = () => { - console.log('reloading settings') + debug('reloading settings') SettingsStatic._settings = undefined SettingsStatic.createSettings() } diff --git a/src/utils/sliding-window-rate-limiter.ts b/src/utils/sliding-window-rate-limiter.ts index fdc3fdf6..7dcb62a9 100644 --- a/src/utils/sliding-window-rate-limiter.ts +++ b/src/utils/sliding-window-rate-limiter.ts @@ -17,8 +17,6 @@ export class SlidingWindowRateLimiter implements IRateLimiter { const timestamp = Date.now() const { period } = options - debug('add %d hits on %s bucket', step, key) - const [,, entries] = await Promise.all([ this.cache.removeRangeByScoreFromSortedSet(key, 0, timestamp - period), this.cache.addToSortedSet(key, { [`${timestamp}:${step}`]: timestamp.toString() }), diff --git a/src/utils/transform.ts b/src/utils/transform.ts index a5b8ccf9..33aa9244 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -1,7 +1,7 @@ -import { always, applySpec, ifElse, is, isNil, path, pipe, prop, propSatisfies } from 'ramda' +import { always, applySpec, cond, equals, ifElse, is, isNil, multiply, path, pathSatisfies, pipe, prop, propSatisfies, T } from 'ramda' import { bech32 } from 'bech32' -import { Invoice } from '../@types/invoice' +import { Invoice, InvoiceStatus, InvoiceUnit } from '../@types/invoice' import { User } from '../@types/user' export const toJSON = (input: any) => JSON.stringify(input) @@ -10,10 +10,12 @@ export const toBuffer = (input: any) => Buffer.from(input, 'hex') export const fromBuffer = (input: Buffer) => input.toString('hex') -export const toBigInt = (input: string): bigint => BigInt(input) +export const toBigInt = (input: string | number): bigint => BigInt(input) export const fromBigInt = (input: bigint) => input.toString() +const addTime = (ms: number) => (input: Date) => new Date(input.getTime() + ms) + export const fromDBInvoice = applySpec({ id: prop('id') as () => string, pubkey: pipe(prop('pubkey') as () => Buffer, fromBuffer), @@ -31,6 +33,7 @@ export const fromDBInvoice = applySpec({ expiresAt: prop('expires_at'), updatedAt: prop('updated_at'), createdAt: prop('created_at'), + verifyURL: prop('verify_url'), }) export const fromDBUser = applySpec({ @@ -56,7 +59,7 @@ export const toBech32 = (prefix: string) => (input: string): string => { return bech32.encode(prefix, bech32.toWords(Buffer.from(input, 'hex'))) } -export const toDate = (input: string) => new Date(input) +export const toDate = (input: string | number) => new Date(input) export const fromZebedeeInvoice = applySpec({ id: prop('id'), @@ -81,5 +84,96 @@ export const fromZebedeeInvoice = applySpec({ pipe(prop('createdAt'), toDate), always(null), ), - rawRespose: toJSON, + rawResponse: toJSON, +}) + +export const fromNodelessInvoice = applySpec({ + id: prop('id'), + pubkey: path(['metadata', 'requestId']), + bolt11: prop('lightningInvoice'), + amountRequested: pipe(prop('satsAmount') as () => number, toBigInt), + description: path(['metadata', 'description']), + unit: path(['metadata', 'unit']), + status: pipe( + prop('status'), + cond([ + [equals('new'), always(InvoiceStatus.PENDING)], + [equals('pending_confirmation'), always(InvoiceStatus.PENDING)], + [equals('underpaid'), always(InvoiceStatus.PENDING)], + [equals('in_flight'), always(InvoiceStatus.PENDING)], + [equals('paid'), always(InvoiceStatus.COMPLETED)], + [equals('overpaid'), always(InvoiceStatus.COMPLETED)], + [equals('expired'), always(InvoiceStatus.EXPIRED)], + ]), + ), + expiresAt: ifElse( + propSatisfies(is(String), 'expiresAt'), + pipe(prop('expiresAt'), toDate), + ifElse( + propSatisfies(is(String), 'createdAt'), + pipe(prop('createdAt'), toDate, addTime(15 * 60000)), + always(null), + ), + ), + confirmedAt: cond([ + [propSatisfies(is(String), 'paidAt'), pipe(prop('paidAt'), toDate)], + [T, always(null)], + ]), + createdAt: ifElse( + propSatisfies(is(String), 'createdAt'), + pipe(prop('createdAt'), toDate), + always(null), + ), + // rawResponse: toJSON, +}) + +export const fromOpenNodeInvoice = applySpec({ + id: prop('id'), + pubkey: prop('order_id'), + bolt11: ifElse( + pathSatisfies(is(String), ['lightning_invoice', 'payreq']), + path(['lightning_invoice', 'payreq']), + path(['lightning', 'payreq']) + ), + amountRequested: pipe( + ifElse( + propSatisfies(is(Number), 'amount'), + prop('amount'), + prop('price'), + ) as () => number, + toBigInt, + ), + description: prop('description'), + unit: always(InvoiceUnit.SATS), + status: pipe( + prop('status'), + cond([ + [equals('expired'), always(InvoiceStatus.EXPIRED)], + [equals('refunded'), always(InvoiceStatus.EXPIRED)], + [equals('unpaid'), always(InvoiceStatus.PENDING)], + [equals('processing'), always(InvoiceStatus.PENDING)], + [equals('underpaid'), always(InvoiceStatus.PENDING)], + [equals('paid'), always(InvoiceStatus.COMPLETED)], + ]), + ), + expiresAt: pipe( + cond([ + [pathSatisfies(is(String), ['lightning', 'expires_at']), path(['lightning', 'expires_at'])], + [pathSatisfies(is(Number), ['lightning_invoice', 'expires_at']), pipe(path(['lightning_invoice', 'expires_at']), multiply(1000))], + ]), + toDate, + ), + confirmedAt: cond([ + [propSatisfies(equals('paid'), 'status'), () => new Date()], + [T, always(null)], + ]), + createdAt: pipe( + ifElse( + propSatisfies(is(Number), 'created_at'), + pipe(prop('created_at'), multiply(1000)), + prop('created_at'), + ), + toDate, + ), + rawResponse: toJSON, }) diff --git a/test/integration/features/helpers.ts b/test/integration/features/helpers.ts index 26a2e379..a401d3a8 100644 --- a/test/integration/features/helpers.ts +++ b/test/integration/features/helpers.ts @@ -1,5 +1,5 @@ import * as secp256k1 from '@noble/secp256k1' -import { createHash, createHmac, Hash } from 'crypto' +import { createHash, createHmac, getRandomValues, Hash } from 'crypto' import { Observable } from 'rxjs' import WebSocket from 'ws' @@ -54,7 +54,9 @@ export async function createEvent(input: Partial, privkey: any): Promise< } export function createIdentity(name: string) { - const hmac = createHmac('sha256', process.env.SECRET ?? Math.random().toString()) + const buffer = new Uint32Array(10) + getRandomValues(buffer) + const hmac = createHmac('sha256', buffer) hmac.update(name) const privkey = hmac.digest().toString('hex') const pubkey = Buffer.from(secp256k1.getPublicKey(privkey, true)).toString('hex').substring(2) diff --git a/test/integration/features/nip-01/nip-01.feature b/test/integration/features/nip-01/nip-01.feature index e8d7264a..be0c2ca9 100644 --- a/test/integration/features/nip-01/nip-01.feature +++ b/test/integration/features/nip-01/nip-01.feature @@ -72,7 +72,6 @@ Feature: NIP-01 And Alice subscribes to text_note events from Bob and set_metadata events from Charlie Then Alice receives 2 events from Bob and Charlie - @test Scenario: Alice is interested in Bob's events from back in November Given someone called Alice And someone called Bob diff --git a/test/integration/features/nip-09/nip-09.feature b/test/integration/features/nip-09/nip-09.feature index 663724ff..1bc53233 100644 --- a/test/integration/features/nip-09/nip-09.feature +++ b/test/integration/features/nip-09/nip-09.feature @@ -21,14 +21,10 @@ Feature: NIP-09 And Alice drafts a text_note event with content "Twitter > Nostr" When Alice sends a delete event for their last event And Alice sends their last draft event successfully - And Alice subscribes to author Alice - Then Alice receives 1 delete event from Alice and EOSE Scenario: Alice sends a delete before deleted set_metadata Given someone called Alice And someone called Bob And Alice drafts a set_metadata event When Alice sends a delete event for their last event - And Alice sends their last draft event unsuccessfully - And Alice subscribes to author Alice - Then Alice receives 1 delete event from Alice and EOSE + Then Alice sends their last draft event successfully diff --git a/test/integration/features/nip-16/nip-16.feature b/test/integration/features/nip-16/nip-16.feature index 53225b41..b99d5f55 100644 --- a/test/integration/features/nip-16/nip-16.feature +++ b/test/integration/features/nip-16/nip-16.feature @@ -1,10 +1,9 @@ Feature: NIP-16 Event treatment Scenario: Alice sends a replaceable event Given someone called Alice - And Alice subscribes to author Alice When Alice sends a replaceable_event_0 event with content "created" - Then Alice receives a replaceable_event_0 event from Alice with content "created" - When Alice sends a replaceable_event_0 event with content "updated" + And Alice sends a replaceable_event_0 event with content "updated" + And Alice subscribes to author Alice Then Alice receives a replaceable_event_0 event from Alice with content "updated" Then Alice unsubscribes from author Alice When Alice subscribes to author Alice @@ -12,9 +11,10 @@ Feature: NIP-16 Event treatment Scenario: Charlie sends an ephemeral event Given someone called Charlie - And Charlie subscribes to author Charlie + Given someone called Alice + And Alice subscribes to author Charlie When Charlie sends a ephemeral_event_0 event with content "now you see me" - Then Charlie receives a ephemeral_event_0 event from Charlie with content "now you see me" - Then Charlie unsubscribes from author Charlie - When Charlie subscribes to author Charlie - Then Charlie receives 0 ephemeral_event_0 events and EOSE + Then Alice receives a ephemeral_event_0 event from Charlie with content "now you see me" + Then Alice unsubscribes from author Charlie + When Alice subscribes to author Charlie + Then Alice receives 0 ephemeral_event_0 events and EOSE diff --git a/test/integration/features/nip-33/nip-33.feature b/test/integration/features/nip-33/nip-33.feature index cda27290..dc669c61 100644 --- a/test/integration/features/nip-33/nip-33.feature +++ b/test/integration/features/nip-33/nip-33.feature @@ -1,11 +1,53 @@ Feature: NIP-33 Parameterized replaceable events Scenario: Alice sends a parameterized replaceable event Given someone called Alice - And Alice subscribes to author Alice When Alice sends a parameterized_replaceable_event_0 event with content "1" and tag d containing "variable" - Then Alice receives a parameterized_replaceable_event_0 event from Alice with content "1" and tag d containing "variable" When Alice sends a parameterized_replaceable_event_0 event with content "2" and tag d containing "variable" - Then Alice receives a parameterized_replaceable_event_0 event from Alice with content "2" and tag d containing "variable" - Then Alice unsubscribes from author Alice When Alice subscribes to author Alice - Then Alice receives 1 parameterized_replaceable_event_0 event from Alice with content "2" and EOSE + Then Alice receives a parameterized_replaceable_event_0 event from Alice with content "2" and tag d containing "variable" + + Scenario: Alice adds an expiration tag to a parameterized replaceable event + Given someone called Alice + And someone called Bob + When Alice sends a parameterized_replaceable_event_1 event with content "woot" and tag d containing "stuff" + And Alice sends a parameterized_replaceable_event_1 event with content "nostr.watch" and tag d containing "stuff" and expiring in the future + And Bob subscribes to author Alice + Then Bob receives a parameterized_replaceable_event_1 event from Alice with content "nostr.watch" and tag d containing "stuff" + + Scenario: Alice removes an expiration tag to a parameterized replaceable event + Given someone called Alice + And someone called Bob + When Alice sends a parameterized_replaceable_event_1 event with content "nostr.watch" and tag d containing "hey" and expiring in the future + And Alice sends a parameterized_replaceable_event_1 event with content "woot" and tag d containing "hey" + And Bob subscribes to author Alice + Then Bob receives a parameterized_replaceable_event_1 event from Alice with content "woot" and tag d containing "hey" + + Scenario: Alice adds and removes an expiration tag to a parameterized replaceable event + Given someone called Alice + And someone called Bob + When Alice sends a parameterized_replaceable_event_1 event with content "first" and tag d containing "friends" + And Alice sends a parameterized_replaceable_event_1 event with content "second" and tag d containing "friends" and expiring in the future + And Alice sends a parameterized_replaceable_event_1 event with content "third" and tag d containing "friends" + And Bob subscribes to author Alice + Then Bob receives a parameterized_replaceable_event_1 event from Alice with content "third" and tag d containing "friends" + + Scenario: Alice deletes a parameterized replaceable event + Given someone called Alice + When Alice sends a parameterized_replaceable_event_1 event with content "exercise" and tag d containing "2023-resolutions" + And Alice sends a delete event for their last event + And Alice subscribes to author Alice + Then Alice receives 1 delete event from Alice and EOSE + + Scenario: Alice deletes and replaces a parameterized replaceable event + Given someone called Alice + And Alice sends a parameterized_replaceable_event_1 event with content "gym" and tag d containing "2024-resolutions" + And Alice sends a delete event for their last event + When Alice sends a parameterized_replaceable_event_1 event with content "exercise" and tag d containing "2024-resolutions" + And Alice subscribes to parameterized_replaceable_event_1 events from Alice + Then Alice receives a parameterized_replaceable_event_1 event from Alice with content "exercise" and tag d containing "2024-resolutions" + + Scenario: Alice deletes before sending parameterized replaceable event + Given someone called Alice + And Alice drafts a parameterized_replaceable_event_2 event with content "don't worry about it" and tag d containing "topsycrets" + When Alice sends a delete event for their last event + And Alice sends their last draft event successfully \ No newline at end of file diff --git a/test/integration/features/nip-33/nip-33.feature.ts b/test/integration/features/nip-33/nip-33.feature.ts index e2cbf7ac..cba37160 100644 --- a/test/integration/features/nip-33/nip-33.feature.ts +++ b/test/integration/features/nip-33/nip-33.feature.ts @@ -1,9 +1,11 @@ -import { Then, When } from '@cucumber/cucumber' +import { Then, When, World } from '@cucumber/cucumber' import { expect } from 'chai' import WebSocket from 'ws' -import { createEvent, sendEvent, waitForEventCount, waitForNextEvent } from '../helpers' +import { createEvent, createSubscription, sendEvent, waitForEventCount, waitForNextEvent } from '../helpers' +import { EventKinds, EventTags } from '../../../../src/constants/base' import { Event } from '../../../../src/@types/event' +import { isDraft } from '../shared' When(/^(\w+) sends a parameterized_replaceable_event_0 event with content "([^"]+)" and tag (\w) containing "([^"]+)"$/, async function( name: string, @@ -20,6 +22,52 @@ When(/^(\w+) sends a parameterized_replaceable_event_0 event with content "([^"] this.parameters.events[name].push(event) }) +When(/^(\w+) sends a parameterized_replaceable_event_1 event with content "([^"]+)" and tag (\w) containing "([^"]+)"$/, async function( + name: string, + content: string, + tag: string, + value: string, +) { + const ws = this.parameters.clients[name] as WebSocket + const { pubkey, privkey } = this.parameters.identities[name] + + const event: Event = await createEvent( + { + pubkey, + kind: EventKinds.PARAMETERIZED_REPLACEABLE_FIRST + 1, + content, + tags: [[tag, value]], + }, + privkey, + ) + + await sendEvent(ws, event) + this.parameters.events[name].push(event) +}) + +When(/^(\w+) sends a parameterized_replaceable_event_1 event with content "([^"]+)" and tag (\w) containing "([^"]+)" and expiring in the future$/, async function( + name: string, + content: string, + tag: string, + value: string, +) { + const ws = this.parameters.clients[name] as WebSocket + const { pubkey, privkey } = this.parameters.identities[name] + + const event: Event = await createEvent( + { + pubkey, + kind: EventKinds.PARAMETERIZED_REPLACEABLE_FIRST + 1, + content, + tags: [[tag, value], [EventTags.Expiration, Math.floor(new Date().getTime() / 1000 + 10).toString()]], + }, + privkey, + ) + + await sendEvent(ws, event) + this.parameters.events[name].push(event) +}) + Then( /(\w+) receives a parameterized_replaceable_event_0 event from (\w+) with content "([^"]+?)" and tag (\w+) containing "([^"]+?)"/, async function(name: string, author: string, content: string, tagName: string, tagValue: string) { @@ -33,6 +81,19 @@ Then( expect(receivedEvent.tags[0]).to.deep.equal([tagName, tagValue]) }) +Then( + /(\w+) receives a parameterized_replaceable_event_1 event from (\w+) with content "([^"]+?)" and tag (\w+) containing "([^"]+?)"/, + async function(name: string, author: string, content: string, tagName: string, tagValue: string) { + const ws = this.parameters.clients[name] as WebSocket + const subscription = this.parameters.subscriptions[name][this.parameters.subscriptions[name].length - 1] + const receivedEvent = await waitForNextEvent(ws, subscription.name) + + expect(receivedEvent.kind).to.equal(30001) + expect(receivedEvent.pubkey).to.equal(this.parameters.identities[author].pubkey) + expect(receivedEvent.content).to.equal(content) + expect(receivedEvent.tags[0]).to.deep.equal([tagName, tagValue]) +}) + Then(/(\w+) receives (\d+) parameterized_replaceable_event_0 events? from (\w+) with content "([^"]+?)" and EOSE/, async function( name: string, count: string, @@ -48,3 +109,40 @@ Then(/(\w+) receives (\d+) parameterized_replaceable_event_0 events? from (\w+) expect(events[0].pubkey).to.equal(this.parameters.identities[author].pubkey) expect(events[0].content).to.equal(content) }) + +When(/^(\w+) subscribes to parameterized_replaceable_event_1 events from (\w+)$/, async function (this: World>, name: string, author: string) { + const ws = this.parameters.clients[name] as WebSocket + const authorPubkey = this.parameters.identities[author].pubkey + const subscription = { + name: `test-${Math.random()}`, + filters: [ + { kinds: [EventKinds.PARAMETERIZED_REPLACEABLE_FIRST + 1], authors: [authorPubkey] }, + ], + } + this.parameters.subscriptions[name].push(subscription) + + await createSubscription(ws, subscription.name, subscription.filters) +}) + + +Then(/^(\w+) drafts a parameterized_replaceable_event_2 event with content "([^"]+?)" and tag (\w+) containing "([^"]+?)"$/, async function ( + name: string, + content: string, + tagName: string, + tagValue: string, +) { + const { pubkey, privkey } = this.parameters.identities[name] + + const event: Event = await createEvent({ + pubkey, + kind: EventKinds.PARAMETERIZED_REPLACEABLE_FIRST + 2, + content, + tags: [ + [tagName, tagValue], + ], + }, privkey) + + event[isDraft] = true + + this.parameters.events[name].push(event) +}) \ No newline at end of file diff --git a/test/integration/features/shared.ts b/test/integration/features/shared.ts index 38aaa854..d515d00f 100644 --- a/test/integration/features/shared.ts +++ b/test/integration/features/shared.ts @@ -35,19 +35,22 @@ export const streams = new WeakMap>() BeforeAll({ timeout: 1000 }, async function () { process.env.RELAY_PORT = '18808' - cacheClient = getCacheClient() + process.env.SECRET = Math.random().toString().repeat(6) dbClient = getMasterDbClient() rrDbClient = getReadReplicaDbClient() + cacheClient = getCacheClient() await dbClient.raw('SELECT 1=1') + await rrDbClient.raw('SELECT 1=1') Sinon.stub(SettingsStatic, 'watchSettings') const settings = SettingsStatic.createSettings() SettingsStatic._settings = pipe( - assocPath( ['limits', 'event', 'createdAt', 'maxPositiveDelta'], 0), - assocPath( ['limits', 'message', 'rateLimits'], []), - assocPath( ['limits', 'event', 'rateLimits'], []), - assocPath( ['limits', 'invoice', 'rateLimits'], []), - assocPath( ['limits', 'connection', 'rateLimits'], []), + assocPath(['payments', 'enabled'], false), + assocPath(['limits', 'event', 'createdAt', 'maxPositiveDelta'], 0), + assocPath(['limits', 'message', 'rateLimits'], []), + assocPath(['limits', 'event', 'rateLimits'], []), + assocPath(['limits', 'invoice', 'rateLimits'], []), + assocPath(['limits', 'connection', 'rateLimits'], []), )(settings) as any worker = workerFactory() @@ -56,7 +59,11 @@ BeforeAll({ timeout: 1000 }, async function () { AfterAll(async function() { worker.close(async () => { - await Promise.all([cacheClient.disconnect(), dbClient.destroy(), rrDbClient.destroy()]) + await Promise.all([ + dbClient.destroy(), + rrDbClient.destroy(), + cacheClient.disconnect(), + ]) }) }) @@ -77,14 +84,11 @@ After(async function () { } this.parameters.clients = {} - const dbClient = getMasterDbClient() - await dbClient('events') - .where({ - event_pubkey: Object + .whereIn('event_pubkey', Object .values(this.parameters.identities as Record) .map(({ pubkey }) => Buffer.from(pubkey, 'hex')), - }).del() + ).delete() this.parameters.identities = {} }) @@ -94,14 +98,14 @@ Given(/someone called (\w+)/, async function(name: string) { this.parameters.clients[name] = connection this.parameters.subscriptions[name] = [] this.parameters.events[name] = [] - const subject = new Subject() - connection.once('close', subject.next.bind(subject)) + const close = new Subject() + connection.once('close', close.next.bind(close)) - const project = (raw: MessageEvent) => JSON.parse(raw.data.toString('utf8')) + const projection = (raw: MessageEvent) => JSON.parse(raw.data.toString('utf8')) const replaySubject = new ReplaySubject(2, 1000) - fromEvent(connection, 'message').pipe(map(project) as any,takeUntil(subject)).subscribe(replaySubject) + fromEvent(connection, 'message').pipe(map(projection) as any,takeUntil(close)).subscribe(replaySubject) streams.set( connection, diff --git a/test/unit/factories/delegated-event-strategy-factory.spec.ts b/test/unit/factories/delegated-event-strategy-factory.spec.ts deleted file mode 100644 index 9cc4e0cb..00000000 --- a/test/unit/factories/delegated-event-strategy-factory.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { expect } from 'chai' - -import { DefaultEventStrategy } from '../../../src/handlers/event-strategies/default-event-strategy' -import { delegatedEventStrategyFactory } from '../../../src/factories/delegated-event-strategy-factory' -import { EphemeralEventStrategy } from '../../../src/handlers/event-strategies/ephemeral-event-strategy' -import { Event } from '../../../src/@types/event' -import { EventKinds } from '../../../src/constants/base' -import { Factory } from '../../../src/@types/base' -import { IEventRepository } from '../../../src/@types/repositories' -import { IEventStrategy } from '../../../src/@types/message-handlers' -import { IWebSocketAdapter } from '../../../src/@types/adapters' - -describe('delegatedEventStrategyFactory', () => { - let eventRepository: IEventRepository - let event: Event - let adapter: IWebSocketAdapter - let factory: Factory>, [Event, IWebSocketAdapter]> - - beforeEach(() => { - eventRepository = {} as any - event = {} as any - adapter = {} as any - - factory = delegatedEventStrategyFactory(eventRepository) - }) - - it('returns EphemeralEventStrategy given a set_metadata event', () => { - event.kind = EventKinds.EPHEMERAL_FIRST - expect(factory([event, adapter])).to.be.an.instanceOf(EphemeralEventStrategy) - }) - - it('returns DefaultEventStrategy given a text_note event', () => { - event.kind = EventKinds.TEXT_NOTE - expect(factory([event, adapter])).to.be.an.instanceOf(DefaultEventStrategy) - }) - - it('returns undefined given a replaceable event', () => { - event.kind = EventKinds.REPLACEABLE_FIRST - expect(factory([event, adapter])).to.be.undefined - }) - - it('returns undefined given a delete event', () => { - event.kind = EventKinds.DELETE - expect(factory([event, adapter])).to.be.undefined - }) -}) diff --git a/test/unit/factories/message-handler-factory.spec.ts b/test/unit/factories/message-handler-factory.spec.ts index b44c1ce7..4c5299ff 100644 --- a/test/unit/factories/message-handler-factory.spec.ts +++ b/test/unit/factories/message-handler-factory.spec.ts @@ -2,10 +2,8 @@ import { expect } from 'chai' import { IEventRepository, IUserRepository } from '../../../src/@types/repositories' import { IncomingMessage, MessageType } from '../../../src/@types/messages' -import { DelegatedEventMessageHandler } from '../../../src/handlers/delegated-event-message-handler' import { Event } from '../../../src/@types/event' import { EventMessageHandler } from '../../../src/handlers/event-message-handler' -import { EventTags } from '../../../src/constants/base' import { IWebSocketAdapter } from '../../../src/@types/adapters' import { messageHandlerFactory } from '../../../src/factories/message-handler-factory' import { SubscribeMessageHandler } from '../../../src/handlers/subscribe-message-handler' @@ -38,18 +36,6 @@ describe('messageHandlerFactory', () => { expect(factory([message, adapter])).to.be.an.instanceOf(EventMessageHandler) }) - it('returns DelegatedEventMessageHandler when given an EVENT message with delegated event', () => { - event.tags = [ - [EventTags.Delegation, '', '', ''], - ] - message = [ - MessageType.EVENT, - event, - ] - - expect(factory([message, adapter])).to.be.an.instanceOf(DelegatedEventMessageHandler) - }) - it('returns SubscribeMessageHandler when given a REQ message', () => { message = [ MessageType.REQ, diff --git a/test/unit/handlers/delegated-event-message-handler.spec.ts b/test/unit/handlers/delegated-event-message-handler.spec.ts deleted file mode 100644 index d32e9ac6..00000000 --- a/test/unit/handlers/delegated-event-message-handler.spec.ts +++ /dev/null @@ -1,228 +0,0 @@ -import chai from 'chai' -import chaiAsPromised from 'chai-as-promised' -import EventEmitter from 'events' -import Sinon from 'sinon' -import sinonChai from 'sinon-chai' - -chai.use(sinonChai) -chai.use(chaiAsPromised) - -import { IncomingEventMessage, MessageType } from '../../../src/@types/messages' -import { DelegatedEventMessageHandler } from '../../../src/handlers/delegated-event-message-handler' -import { Event } from '../../../src/@types/event' -import { EventMessageHandler } from '../../../src/handlers/event-message-handler' -import { IUserRepository } from '../../../src/@types/repositories' -import { WebSocketAdapterEvent } from '../../../src/constants/adapter' - -const { expect } = chai - -describe('DelegatedEventMessageHandler', () => { - let webSocket: EventEmitter - let handler: DelegatedEventMessageHandler - let userRepository: IUserRepository - let event: Event - let message: IncomingEventMessage - let sandbox: Sinon.SinonSandbox - - let originalConsoleWarn: any = undefined - - beforeEach(() => { - sandbox = Sinon.createSandbox() - originalConsoleWarn = console.warn - console.warn = () => undefined - event = { - content: 'hello', - created_at: 1665546189, - id: 'f'.repeat(64), - kind: 1, - pubkey: 'f'.repeat(64), - sig: 'f'.repeat(128), - tags: [ - ['delegation', 'delegator', 'rune', 'signature'], - ], - } - }) - - afterEach(() => { - console.warn = originalConsoleWarn - sandbox.restore() - }) - - describe('handleMessage', () => { - let canAcceptEventStub: Sinon.SinonStub - let isEventValidStub: Sinon.SinonStub - let strategyFactoryStub: Sinon.SinonStub - let onMessageSpy: Sinon.SinonSpy - let strategyExecuteStub: Sinon.SinonStub - let isRateLimitedStub: Sinon.SinonStub - let isUserAdmitted: Sinon.SinonStub - - beforeEach(() => { - canAcceptEventStub = sandbox.stub(DelegatedEventMessageHandler.prototype, 'canAcceptEvent' as any) - isEventValidStub = sandbox.stub(DelegatedEventMessageHandler.prototype, 'isEventValid' as any) - isUserAdmitted = sandbox.stub(EventMessageHandler.prototype, 'isUserAdmitted' as any) - strategyExecuteStub = sandbox.stub() - strategyFactoryStub = sandbox.stub().returns({ - execute: strategyExecuteStub, - }) - onMessageSpy = sandbox.fake.returns(undefined) - webSocket = new EventEmitter() - webSocket.on(WebSocketAdapterEvent.Message, onMessageSpy) - message = [MessageType.EVENT, event] - isRateLimitedStub = sandbox.stub(EventMessageHandler.prototype, 'isRateLimited' as any) - handler = new DelegatedEventMessageHandler( - webSocket as any, - strategyFactoryStub, - userRepository, - () => ({}) as any, - () => ({ hit: async () => false }), - ) - }) - - afterEach(() => { - isEventValidStub.restore() - canAcceptEventStub.restore() - webSocket.removeAllListeners() - }) - - it('rejects event if it can\'t be accepted', async () => { - canAcceptEventStub.returns('reason') - - await handler.handleMessage(message) - - expect(canAcceptEventStub).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).to.have.been.calledOnceWithExactly( - [ - MessageType.OK, - 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', - false, - 'reason', - ], - ) - expect(strategyFactoryStub).not.to.have.been.called - }) - - it('rejects event if invalid', async () => { - isEventValidStub.returns('reason') - - await handler.handleMessage(message) - - expect(isEventValidStub).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).not.to.have.been.calledOnceWithExactly() - expect(strategyFactoryStub).not.to.have.been.called - }) - - it('rejects event if rate-limited', async () => { - isRateLimitedStub.resolves(true) - - await handler.handleMessage(message) - - expect(isRateLimitedStub).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).to.have.been.calledOnceWithExactly( - [MessageType.OK, event.id, false, 'rate-limited: slow down'], - ) - expect(strategyFactoryStub).not.to.have.been.called - }) - - it('rejects event is user is not admitted', async () => { - isUserAdmitted.resolves('not admitted') - - await handler.handleMessage(message) - - expect(isRateLimitedStub).to.have.been.calledOnceWithExactly(event) - expect(isUserAdmitted).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).to.have.been.calledOnceWithExactly([ - MessageType.OK, - event.id, - false, - 'not admitted', - ]) - }) - - it('does not call strategy if none given', async () => { - isEventValidStub.returns(undefined) - canAcceptEventStub.returns(undefined) - strategyFactoryStub.returns(undefined) - - await handler.handleMessage(message) - - expect(isEventValidStub).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).not.to.have.been.calledOnceWithExactly() - expect(strategyFactoryStub).to.have.been.calledOnceWithExactly([ - event, - webSocket, - ]) - expect(strategyExecuteStub).not.to.have.been.called - }) - - it('calls strategy with event', async () => { - isEventValidStub.returns(undefined) - canAcceptEventStub.returns(undefined) - - await handler.handleMessage(message) - - expect(isEventValidStub).to.have.been.calledOnceWithExactly(event) - expect(onMessageSpy).not.to.have.been.calledOnceWithExactly() - expect(strategyFactoryStub).to.have.been.calledOnceWithExactly([ - event, - webSocket, - ]) - expect(strategyExecuteStub).to.have.been.calledOnceWithExactly(event) - }) - - it('does not reject if strategy rejects', async () => { - const error = new Error('mistakes were made') - isEventValidStub.returns(undefined) - canAcceptEventStub.returns(undefined) - strategyExecuteStub.rejects(error) - - return expect(handler.handleMessage(message)).to.eventually.be.fulfilled - }) - }) - - describe('isEventValid', () => { - let parentIsEventValidStub: Sinon.SinonStub - - beforeEach(() => { - parentIsEventValidStub = Sinon.stub(EventMessageHandler.prototype, 'isEventValid' as any) - event = { - 'id': 'a080fd288b60ac2225ff2e2d815291bd730911e583e177302cc949a15dc2b2dc', - 'pubkey': '62903b1ff41559daf9ee98ef1ae67cc52f301bb5ce26d14baba3052f649c3f49', - 'created_at': 1660896109, - 'kind': 1, - 'tags': [ - [ - 'delegation', - '86f0689bd48dcd19c67a19d994f938ee34f251d8c39976290955ff585f2db42e', - 'kind=1&created_at>1640995200', - 'c33c88ba78ec3c760e49db591ac5f7b129e3887c8af7729795e85a0588007e5ac89b46549232d8f918eefd73e726cb450135314bfda419c030d0b6affe401ec1', - ], - ], - 'content': 'Hello world', - 'sig': 'cd4a3cd20dc61dcbc98324de561a07fd23b3d9702115920c0814b5fb822cc5b7c5bcdaf3fa326d24ed50c5b9c8214d66c75bae34e3a84c25e4d122afccb66eb6', - } - }) - - afterEach(() => { - parentIsEventValidStub.restore() - }) - - it('returns undefined if event and delegate tag is valid', async () => { - parentIsEventValidStub.resolves(undefined) - - expect(await (handler as any).isEventValid(event)).to.be.undefined - }) - - it('returns reason if event is not valid', () => { - parentIsEventValidStub.resolves('reason') - return expect((handler as any).isEventValid(event)).to.eventually.equal('reason') - }) - - it('returns reason if delegate signature is not valid', () => { - parentIsEventValidStub.resolves(undefined) - - event.tags[0][3] = 'wrong sig' - return expect((handler as any).isEventValid(event)).to.eventually.equal('invalid: delegation verification failed') - }) - }) -}) diff --git a/test/unit/handlers/event-message-handler.spec.ts b/test/unit/handlers/event-message-handler.spec.ts index a1e9004e..c28d5e0a 100644 --- a/test/unit/handlers/event-message-handler.spec.ts +++ b/test/unit/handlers/event-message-handler.spec.ts @@ -26,11 +26,17 @@ describe('EventMessageHandler', () => { let event: Event let message: IncomingEventMessage let sandbox: Sinon.SinonSandbox + let origEnv: NodeJS.ProcessEnv let originalConsoleWarn: (message?: any, ...optionalParams: any[]) => void | undefined = undefined beforeEach(() => { sandbox = Sinon.createSandbox() + origEnv = { ...process.env } + process.env = { + // deepcode ignore HardcodedNonCryptoSecret/test: + SECRET: 'changeme', + } originalConsoleWarn = console.warn console.warn = () => undefined event = { @@ -45,6 +51,7 @@ describe('EventMessageHandler', () => { }) afterEach(() => { + process.env = origEnv console.warn = originalConsoleWarn sandbox.restore() }) @@ -75,7 +82,9 @@ describe('EventMessageHandler', () => { webSocket as any, strategyFactoryStub, userRepository, - () => ({}) as any, + () => ({ + info: { relay_url: 'relay_url' }, + }) as any, () => ({ hit: async () => false }) ) }) @@ -128,7 +137,7 @@ describe('EventMessageHandler', () => { expect(isUserAdmitted).to.have.been.calledWithExactly(event) expect(strategyFactoryStub).not.to.have.been.called }) - + it('rejects event if it is expired', async () => { isEventValidStub.resolves(undefined) @@ -223,6 +232,9 @@ describe('EventMessageHandler', () => { }, } settings = { + info: { + relay_url: 'relay_url', + }, limits: { event: eventLimits, }, @@ -573,7 +585,7 @@ describe('EventMessageHandler', () => { it('returns undefined if kind is not blacklisted in range', () => { eventLimits.kind.blacklist = [[1, 5]] - event.kind = 6 + event.kind = EventKinds.REACTION expect( (handler as any).canAcceptEvent(event) ).to.be.undefined @@ -640,10 +652,10 @@ describe('EventMessageHandler', () => { it('returns reason if kind is not whitelisted in range', () => { eventLimits.kind.whitelist = [[1, 5]] - event.kind = 6 + event.kind = EventKinds.REACTION expect( (handler as any).canAcceptEvent(event) - ).to.equal('blocked: event kind 6 not allowed') + ).to.equal('blocked: event kind 7 not allowed') }) }) }) @@ -690,6 +702,9 @@ describe('EventMessageHandler', () => { rateLimits: [], } settings = { + info: { + relay_url: 'relay_url', + }, limits: { event: eventLimits, }, @@ -852,11 +867,6 @@ describe('EventMessageHandler', () => { period: 60000, rate: 2, }, - { - kinds: [[10, 20]], - period: 86400000, - rate: 3, - }, ] rateLimiterHitStub.resolves(false) @@ -916,4 +926,167 @@ describe('EventMessageHandler', () => { expect(actualResult).to.be.true }) }) + + describe('isUserAdmitted', () => { + let settings: Settings + let userRepository: IUserRepository + let getClientAddressStub: SinonStub + let webSocket: IWebSocketAdapter + let getRelayPublicKeyStub: SinonStub + let userRepositoryFindByPubkeyStub: SinonStub + + beforeEach(() => { + settings = { + info: { + relay_url: 'relay_url', + }, + payments: { + enabled: true, + feeSchedules: { + admission: [ + { + enabled: true, + amount: 1000n, + whitelists: { + pubkeys: [], + event_kinds: [], + }, + }, + ], + }, + }, + limits: { + event: { + pubkey: { + minBalance: 0n, + }, + }, + }, + } as any + event = { + content: 'hello', + created_at: 1665546189, + id: 'f'.repeat(64), + kind: 1, + pubkey: 'f'.repeat(64), + sig: 'f'.repeat(128), + tags: [], + } + getRelayPublicKeyStub = sandbox.stub(EventMessageHandler.prototype, 'getRelayPublicKey' as any) + getClientAddressStub = sandbox.stub() + userRepositoryFindByPubkeyStub = sandbox.stub() + webSocket = { + getClientAddress: getClientAddressStub, + } as any + userRepository = { + findByPubkey: userRepositoryFindByPubkeyStub, + } as any + handler = new EventMessageHandler( + webSocket, + () => null, + userRepository, + () => settings, + () => ({ hit: async () => false }) + ) + }) + + it ('fulfills with undefined if payments are disabled', async () => { + settings.payments.enabled = false + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if event pubkey equals relay\'s own public key', async () => { + getRelayPublicKeyStub.returns(event.pubkey) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if fee schedules are not set', async () => { + settings.payments.feeSchedules = undefined + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if admission fee schedules are not set', async () => { + settings.payments.feeSchedules.admission = undefined + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if there are no admission fee schedules', async () => { + settings.payments.feeSchedules.admission = [] + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if there are no enabled admission fee schedules', async () => { + settings.payments.feeSchedules.admission[0].enabled = false + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if admission fee schedule is waived for pubkey', async () => { + settings.payments.feeSchedules.admission[0].whitelists.pubkeys.push(event.pubkey) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if admission fee schedule is waived for event kind', async () => { + event.kind = EventKinds.ZAP_RECEIPT + settings.payments.feeSchedules.admission[0].whitelists.event_kinds.push(EventKinds.ZAP_RECEIPT) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with undefined if admission fee schedule is waived for event kind range', async () => { + event.kind = EventKinds.TEXT_NOTE + settings.payments.feeSchedules.admission[0].whitelists.event_kinds.push([ + EventKinds.SET_METADATA, + EventKinds.RECOMMEND_SERVER, + ]) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + + it('fulfills with reason if admission fee schedule is not waived for event kind range', async () => { + event.kind = EventKinds.CONTACT_LIST + settings.payments.feeSchedules.admission[0].whitelists.event_kinds.push([ + EventKinds.SET_METADATA, + EventKinds.RECOMMEND_SERVER, + ]) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.equal('blocked: pubkey not admitted') + }) + + it('fulfills with reason if user is not found', async () => { + return expect((handler as any).isUserAdmitted(event)).to.eventually.equal('blocked: pubkey not admitted') + }) + + it('fulfills with reason if user is not admitted', async () => { + userRepositoryFindByPubkeyStub.resolves({ isAdmitted: false }) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.equal('blocked: pubkey not admitted') + }) + + it('fulfills with reason if user is not admitted', async () => { + userRepositoryFindByPubkeyStub.resolves({ isAdmitted: false }) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.equal('blocked: pubkey not admitted') + }) + + it('fulfills with reason if user does not meet minimum balance', async () => { + settings.limits.event.pubkey.minBalance = 1000n + userRepositoryFindByPubkeyStub.resolves({ isAdmitted: true, balance: 999n }) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.equal('blocked: insufficient balance') + }) + + it('fulfills with undefined if user is admitted', async () => { + settings.limits.event.pubkey.minBalance = 0n + userRepositoryFindByPubkeyStub.resolves({ isAdmitted: true }) + + return expect((handler as any).isUserAdmitted(event)).to.eventually.be.undefined + }) + }) }) diff --git a/test/unit/handlers/event-strategies/delete-event-strategy.spec.ts b/test/unit/handlers/event-strategies/delete-event-strategy.spec.ts index 0d632a8c..b2c5fc63 100644 --- a/test/unit/handlers/event-strategies/delete-event-strategy.spec.ts +++ b/test/unit/handlers/event-strategies/delete-event-strategy.spec.ts @@ -32,7 +32,6 @@ describe('DeleteEventStrategy', () => { let webSocketEmitStub: Sinon.SinonStub let eventRepositoryCreateStub: Sinon.SinonStub let eventRepositoryDeleteByPubkeyAndIdsStub: Sinon.SinonStub - let eventRepositoryInsertStubsStub: Sinon.SinonStub let strategy: IEventStrategy> @@ -43,7 +42,6 @@ describe('DeleteEventStrategy', () => { eventRepositoryCreateStub = sandbox.stub(EventRepository.prototype, 'create') eventRepositoryDeleteByPubkeyAndIdsStub = sandbox.stub(EventRepository.prototype, 'deleteByPubkeyAndIds') - eventRepositoryInsertStubsStub = sandbox.stub(EventRepository.prototype, 'insertStubs') webSocketEmitStub = sandbox.stub() webSocket = { @@ -67,18 +65,6 @@ describe('DeleteEventStrategy', () => { expect(eventRepositoryCreateStub).to.have.been.calledOnceWithExactly(event) }) - it('inserts stubs', async () => { - await strategy.execute(event) - - expect(eventRepositoryInsertStubsStub).to.have.been.calledOnceWithExactly( - event.pubkey, - [ - '0000000000000000000000000000000000000000000000000000000000000000', - 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', - ] - ) - }) - it('deletes events if it has e tags', async () => { await strategy.execute(event) @@ -135,7 +121,6 @@ describe('DeleteEventStrategy', () => { expect(eventRepositoryCreateStub).to.have.been.calledOnceWithExactly(event) expect(eventRepositoryDeleteByPubkeyAndIdsStub).not.to.have.been.called - expect(eventRepositoryInsertStubsStub).to.not.have.been.called expect(webSocketEmitStub).not.to.have.been.called }) }) diff --git a/test/unit/handlers/subscribe-message-handler.spec.ts b/test/unit/handlers/subscribe-message-handler.spec.ts index 45b6fd0d..adcdbb5a 100644 --- a/test/unit/handlers/subscribe-message-handler.spec.ts +++ b/test/unit/handlers/subscribe-message-handler.spec.ts @@ -270,7 +270,7 @@ describe('SubscribeMessageHandler', () => { subscriptions.set(subscriptionId, filters) expect((handler as any).canSubscribe(subscriptionId, filters)) - .to.equal('Duplicate subscription subscriptionId: Ignorning') + .to.equal('Duplicate subscription subscriptionId: Ignoring') }) it('returns reason if client subscriptions exceed limits', () => { @@ -305,4 +305,4 @@ describe('SubscribeMessageHandler', () => { expect((handler as any).canSubscribe(subscriptionId, filters)).to.equal('Too many filters: Number of filters per susbscription must be less then or equal to 1') }) }) -}) \ No newline at end of file +}) diff --git a/test/unit/repositories/event-repository.spec.ts b/test/unit/repositories/event-repository.spec.ts index d61006de..abe026f9 100644 --- a/test/unit/repositories/event-repository.spec.ts +++ b/test/unit/repositories/event-repository.spec.ts @@ -11,7 +11,7 @@ chai.use(sinonChai) const { expect } = chai -import { ContextMetadataKey, EventDeduplicationMetadataKey } from '../../../src/constants/base' +import { ContextMetadataKey, EventDeduplicationMetadataKey, EventTags } from '../../../src/constants/base' import { DatabaseClient } from '../../../src/@types/base' import { EventRepository } from '../../../src/repositories/event-repository' @@ -74,7 +74,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_pubkey" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\') or "event_delegator" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\')) order by "event_created_at" asc limit 500') + expect(query).to.equal('select * from "events" where ("event_pubkey" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\')) order by "event_created_at" asc limit 500') }) it('selects events by two authors', () => { @@ -89,7 +89,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_pubkey" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\', X\'32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\') or "event_delegator" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\', X\'32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\')) order by "event_created_at" asc limit 500') + expect(query).to.equal('select * from "events" where ("event_pubkey" in (X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\', X\'32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\')) order by "event_created_at" asc limit 500') }) it('selects events by one author prefix (even length)', () => { @@ -103,7 +103,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 3) = X\'22e804\' or substring("event_delegator" from 1 for 3) = X\'22e804\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 3) = X\'22e804\') order by "event_created_at" asc limit 500') }) it('selects events by one author prefix (odd length)', () => { @@ -117,7 +117,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 4) BETWEEN E\'\\\\x22e804f0\' AND E\'\\\\x22e804ff\' or substring("event_delegator" from 1 for 4) BETWEEN E\'\\\\x22e804f0\' AND E\'\\\\x22e804ff\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 4) BETWEEN E\'\\\\x22e804f0\' AND E\'\\\\x22e804ff\') order by "event_created_at" asc limit 500') }) it('selects events by two author prefix (first even, second odd)', () => { @@ -132,7 +132,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 3) = X\'22e804\' or substring("event_delegator" from 1 for 3) = X\'22e804\' or substring("event_pubkey" from 1 for 4) BETWEEN E\'\\\\x32e18270\' AND E\'\\\\x32e1827f\' or substring("event_delegator" from 1 for 4) BETWEEN E\'\\\\x32e18270\' AND E\'\\\\x32e1827f\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select * from "events" where (substring("event_pubkey" from 1 for 3) = X\'22e804\' or substring("event_pubkey" from 1 for 4) BETWEEN E\'\\\\x32e18270\' AND E\'\\\\x32e1827f\') order by "event_created_at" asc limit 500') }) }) @@ -274,7 +274,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (1 = 0) order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (1 = 0) order by "event_created_at" asc limit 500') }) it('selects events by one #e tag', () => { @@ -282,7 +282,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["e","aaaaaa"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'e\' AND event_tags.tag_value = \'aaaaaa\') order by "event_created_at" asc limit 500') }) it('selects events by two #e tag', () => { @@ -290,7 +290,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["e","aaaaaa"]]\' or "event_tags" @> \'[["e","bbbbbb"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'e\' AND event_tags.tag_value = \'aaaaaa\' or event_tags.tag_name = \'e\' AND event_tags.tag_value = \'bbbbbb\') order by "event_created_at" asc limit 500') }) }) @@ -300,7 +300,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (1 = 0) order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (1 = 0) order by "event_created_at" asc limit 500') }) it('selects events by one #p tag', () => { @@ -308,7 +308,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["p","aaaaaa"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'p\' AND event_tags.tag_value = \'aaaaaa\') order by "event_created_at" asc limit 500') }) it('selects events by two #p tag', () => { @@ -316,7 +316,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["p","aaaaaa"]]\' or "event_tags" @> \'[["p","bbbbbb"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'p\' AND event_tags.tag_value = \'aaaaaa\' or event_tags.tag_name = \'p\' AND event_tags.tag_value = \'bbbbbb\') order by "event_created_at" asc limit 500') }) }) @@ -326,7 +326,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where (1 = 0) order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (1 = 0) order by "event_created_at" asc limit 500') }) it('selects events by one #r tag', () => { @@ -334,7 +334,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["r","aaaaaa"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'r\' AND event_tags.tag_value = \'aaaaaa\') order by "event_created_at" asc limit 500') }) it('selects events by two #r tag', () => { @@ -342,7 +342,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('select * from "events" where ("event_tags" @> \'[["r","aaaaaa"]]\' or "event_tags" @> \'[["r","bbbbbb"]]\') order by "event_created_at" asc limit 500') + expect(query).to.equal('select "events".* from "events" left join "event_tags" on "events"."event_id" = "event_tags"."event_id" where (event_tags.tag_name = \'r\' AND event_tags.tag_value = \'aaaaaa\' or event_tags.tag_name = \'r\' AND event_tags.tag_value = \'bbbbbb\') order by "event_created_at" asc limit 500') }) }) }) @@ -363,7 +363,7 @@ describe('EventRepository', () => { const query = repository.findByFilters(filters).toString() - expect(query).to.equal('(select * from "events" where "event_kind" in (1)) union (select * from "events" where (substring("event_id" from 1 for 3) BETWEEN E\'\\\\xaaaaa0\' AND E\'\\\\xaaaaaf\') order by "event_created_at" asc limit 500) union (select * from "events" where (substring("event_pubkey" from 1 for 3) BETWEEN E\'\\\\xbbbbb0\' AND E\'\\\\xbbbbbf\' or substring("event_delegator" from 1 for 3) BETWEEN E\'\\\\xbbbbb0\' AND E\'\\\\xbbbbbf\') order by "event_created_at" asc limit 500) union (select * from "events" where "event_created_at" >= 1000 order by "event_created_at" asc limit 500) union (select * from "events" where "event_created_at" <= 1000 order by "event_created_at" asc limit 500) union (select * from "events" order by "event_created_at" DESC limit 1000) order by "event_created_at" asc limit 500') + expect(query).to.equal('(select * from "events" where "event_kind" in (1)) union (select * from "events" where (substring("event_id" from 1 for 3) BETWEEN E\'\\\\xaaaaa0\' AND E\'\\\\xaaaaaf\') order by "event_created_at" asc limit 500) union (select * from "events" where (substring("event_pubkey" from 1 for 3) BETWEEN E\'\\\\xbbbbb0\' AND E\'\\\\xbbbbbf\') order by "event_created_at" asc limit 500) union (select * from "events" where "event_created_at" >= 1000 order by "event_created_at" asc limit 500) union (select * from "events" where "event_created_at" <= 1000 order by "event_created_at" asc limit 500) union (select * from "events" order by "event_created_at" DESC limit 1000) order by "event_created_at" asc limit 500') }) }) }) @@ -383,12 +383,12 @@ describe('EventRepository', () => { kind: 1, tags: [ [ - 'p', + EventTags.Pubkey, '8355095016fddbe31fcf1453b26f613553e9758cf2263e190eac8fd96a3d3de9', 'wss://nostr-pub.wellorder.net', ], [ - 'e', + EventTags.Event, '7377fa81fc6c7ae7f7f4ef8938d4a603f7bf98183b35ab128235cc92d4bebf96', 'wss://nostr-relay.untethr.me', ], @@ -417,12 +417,12 @@ describe('EventRepository', () => { kind: 1, tags: [ [ - 'p', + EventTags.Pubkey, '8355095016fddbe31fcf1453b26f613553e9758cf2263e190eac8fd96a3d3de9', 'wss://nostr-pub.wellorder.net', ], [ - 'e', + EventTags.Event, '7377fa81fc6c7ae7f7f4ef8938d4a603f7bf98183b35ab128235cc92d4bebf96', 'wss://nostr-relay.untethr.me', ], @@ -435,25 +435,7 @@ describe('EventRepository', () => { const query = (repository as any).insert(event).toString() - expect(query).to.equal('insert into "events" ("event_content", "event_created_at", "event_delegator", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (\'I\'\'ve set up mirroring between relays: https://i.imgur.com/HxCDipB.png\', 1648351380, NULL, X\'6b3cdd0302ded8068ad3f0269c74423ca4fee460f800f3d90103b63f14400407\', 1, X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\', X\'b37adfed0e6398546d623536f9ddc92b95b7dc71927e1123266332659253ecd0ffa91ddf2c0a82a8426c5b363139d28534d6cac893b8a810149557a3f6d36768\', \'[["p","8355095016fddbe31fcf1453b26f613553e9758cf2263e190eac8fd96a3d3de9","wss://nostr-pub.wellorder.net"],["e","7377fa81fc6c7ae7f7f4ef8938d4a603f7bf98183b35ab128235cc92d4bebf96","wss://nostr-relay.untethr.me"]]\', NULL, \'::1\') on conflict do nothing') - }) - }) - - describe('insertStubs', () => { - let clock: sinon.SinonFakeTimers - - beforeEach(() => { - clock = sinon.useFakeTimers(1673835425) - }) - - afterEach(() => { - clock.restore() - }) - - it('insert stubs by pubkey & event ids', () => { - const query = repository.insertStubs('001122', ['aabbcc', 'ddeeff']).toString() - - expect(query).to.equal('insert into "events" ("deleted_at", "event_content", "event_created_at", "event_deduplication", "event_delegator", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at") values (\'1970-01-20T08:57:15.425Z\', \'\', 1673835, \'["001122",5]\', NULL, X\'aabbcc\', 5, X\'001122\', X\'\', \'[]\', NULL), (\'1970-01-20T08:57:15.425Z\', \'\', 1673835, \'["001122",5]\', NULL, X\'ddeeff\', 5, X\'001122\', X\'\', \'[]\', NULL) on conflict do nothing') + expect(query).to.equal('insert into "events" ("event_content", "event_created_at", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (\'I\'\'ve set up mirroring between relays: https://i.imgur.com/HxCDipB.png\', 1648351380, X\'6b3cdd0302ded8068ad3f0269c74423ca4fee460f800f3d90103b63f14400407\', 1, X\'22e804d26ed16b68db5259e78449e96dab5d464c8f470bda3eb1a70467f2c793\', X\'b37adfed0e6398546d623536f9ddc92b95b7dc71927e1123266332659253ecd0ffa91ddf2c0a82a8426c5b363139d28534d6cac893b8a810149557a3f6d36768\', \'[["p","8355095016fddbe31fcf1453b26f613553e9758cf2263e190eac8fd96a3d3de9","wss://nostr-pub.wellorder.net"],["e","7377fa81fc6c7ae7f7f4ef8938d4a603f7bf98183b35ab128235cc92d4bebf96","wss://nostr-relay.untethr.me"]]\', NULL, \'::1\') on conflict do nothing') }) }) @@ -480,7 +462,7 @@ describe('EventRepository', () => { const query = repository.upsert(event).toString() - expect(query).to.equal('insert into "events" ("event_content", "event_created_at", "event_deduplication", "event_delegator", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (\'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\', 1564498626, \'["55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503",0]\', NULL, X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\', 0, X\'55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503\', X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\', \'[]\', NULL, \'::1\') on conflict (event_pubkey, event_kind, event_deduplication) WHERE (event_kind = 0 OR event_kind = 3 OR event_kind = 41 OR (event_kind >= 10000 AND event_kind < 20000)) OR (event_kind >= 30000 AND event_kind < 40000) do update set "event_id" = X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\',"event_created_at" = 1564498626,"event_tags" = \'[]\',"event_content" = \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\',"event_signature" = X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\',"event_delegator" = NULL,"remote_address" = \'::1\',"expires_at" = NULL where "events"."event_created_at" < 1564498626') + expect(query).to.equal('insert into "events" ("deleted_at", "event_content", "event_created_at", "event_deduplication", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (NULL, \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\', 1564498626, \'["55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503",0]\', X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\', 0, X\'55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503\', X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\', \'[]\', NULL, \'::1\') on conflict (event_pubkey, event_kind, event_deduplication) WHERE (event_kind = 0 OR event_kind = 3 OR event_kind = 41 OR (event_kind >= 10000 AND event_kind < 20000)) OR (event_kind >= 30000 AND event_kind < 40000) do update set "event_id" = X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\',"event_created_at" = 1564498626,"event_tags" = \'[]\',"event_content" = \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\',"event_signature" = X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\',"remote_address" = \'::1\',"expires_at" = NULL,"deleted_at" = NULL where "events"."event_created_at" < 1564498626') }) it('replaces event based on event_pubkey, event_kind and event_deduplication', () => { @@ -498,7 +480,7 @@ describe('EventRepository', () => { const query = repository.upsert(event).toString() - expect(query).to.equal('insert into "events" ("event_content", "event_created_at", "event_deduplication", "event_delegator", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (\'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\', 1564498626, \'["deduplication"]\', NULL, X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\', 0, X\'55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503\', X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\', \'[]\', NULL, \'::1\') on conflict (event_pubkey, event_kind, event_deduplication) WHERE (event_kind = 0 OR event_kind = 3 OR event_kind = 41 OR (event_kind >= 10000 AND event_kind < 20000)) OR (event_kind >= 30000 AND event_kind < 40000) do update set "event_id" = X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\',"event_created_at" = 1564498626,"event_tags" = \'[]\',"event_content" = \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\',"event_signature" = X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\',"event_delegator" = NULL,"remote_address" = \'::1\',"expires_at" = NULL where "events"."event_created_at" < 1564498626') + expect(query).to.equal('insert into "events" ("deleted_at", "event_content", "event_created_at", "event_deduplication", "event_id", "event_kind", "event_pubkey", "event_signature", "event_tags", "expires_at", "remote_address") values (NULL, \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\', 1564498626, \'["deduplication"]\', X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\', 0, X\'55b702c167c85eb1c2d5ab35d68bedd1a35b94c01147364d2395c2f66f35a503\', X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\', \'[]\', NULL, \'::1\') on conflict (event_pubkey, event_kind, event_deduplication) WHERE (event_kind = 0 OR event_kind = 3 OR event_kind = 41 OR (event_kind >= 10000 AND event_kind < 20000)) OR (event_kind >= 30000 AND event_kind < 40000) do update set "event_id" = X\'e527fe8b0f64a38c6877f943a9e8841074056ba72aceb31a4c85e6d10b27095a\',"event_created_at" = 1564498626,"event_tags" = \'[]\',"event_content" = \'{"name":"ottman@minds.io","about":"","picture":"https://feat-2311-nostr.minds.io/icon/1002952989368913934/medium/1564498626/1564498626/1653379539"}\',"event_signature" = X\'d1de98733de2b412549aa64454722d9b66ab3c68e9e0d0f9c5d42e7bd54c30a06174364b683d2c8dbb386ff47f31e6cb7e2f3c3498d8819ee80421216c8309a9\',"remote_address" = \'::1\',"expires_at" = NULL,"deleted_at" = NULL where "events"."event_created_at" < 1564498626') }) }) }) diff --git a/test/unit/schemas/event-schema.spec.ts b/test/unit/schemas/event-schema.spec.ts index 19426e9b..999a1fc2 100644 --- a/test/unit/schemas/event-schema.spec.ts +++ b/test/unit/schemas/event-schema.spec.ts @@ -1,8 +1,9 @@ -import { assocPath, omit, range } from 'ramda' +import { assocPath, omit } from 'ramda' import { expect } from 'chai' import { Event } from '../../../src/@types/event' import { eventSchema } from '../../../src/schemas/event-schema' +import { EventTags } from '../../../src/constants/base' import { validateSchema } from '../../../src/utils/validation' describe('NIP-01', () => { @@ -16,31 +17,31 @@ describe('NIP-01', () => { 'kind': 7, 'tags': [ [ - 'e', + EventTags.Event, 'c58e83bb744e4c29642db7a5c3bd1519516ad5c51f6ba5f90c451d03c1961210', '', 'root', ], [ - 'e', + EventTags.Event, 'd0d78967b734628cec7bdfa2321c71c1f1c48e211b4b54333c3b0e94e7e99166', '', 'reply', ], [ - 'p', + EventTags.Pubkey, 'edfa27d49d2af37ee331e1225bb6ed1912c6d999281b36d8018ad99bc3573c29', ], [ - 'p', + EventTags.Pubkey, '32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245', ], [ - 'e', + EventTags.Event, '6fed2aae1e4f7d8b535774e4f7061c10e2ff20df1ef047da09462c7937925cd5', ], [ - 'p', + EventTags.Pubkey, '2ef93f01cd2493e04235a6b87b10d3c4a74e2a7eb7c3caf168268f6af73314b5', ], ], @@ -115,16 +116,13 @@ describe('NIP-01', () => { ], tag: [ { message: 'must be an array', transform: assocPath(['tags', 0], null) }, - { message: 'must contain less than or equal to 10 items', transform: assocPath(['tags', 0], range(0, 11).map(() => 'x')) }, ], identifier: [ { message: 'must be a string', transform: assocPath(['tags', 0, 0], null) }, - { message: 'length must be less than or equal to 255 characters long', transform: assocPath(['tags', 0, 0], ' '.repeat(256)) }, { message: 'is not allowed to be empty', transform: assocPath(['tags', 0, 0], '') }, ], value: [ { message: 'must be a string', transform: assocPath(['tags', 0, 1], null) }, - { message: 'length must be less than or equal to 1024 characters long', transform: assocPath(['tags', 0, 1], ' '.repeat(1024 + 1)) }, ], } diff --git a/test/unit/schemas/filter-schema.spec.ts b/test/unit/schemas/filter-schema.spec.ts index 09f10812..fab8498f 100644 --- a/test/unit/schemas/filter-schema.spec.ts +++ b/test/unit/schemas/filter-schema.spec.ts @@ -1,4 +1,4 @@ -import { assocPath, range } from 'ramda' +import { assocPath } from 'ramda' import { expect } from 'chai' import { filterSchema } from '../../../src/schemas/filter-schema' @@ -32,7 +32,6 @@ describe('NIP-01', () => { const cases = { ids: [ { message: 'must be an array', transform: assocPath(['ids'], null) }, - { message: 'must contain less than or equal to 1000 items', transform: assocPath(['ids'], range(0, 1001).map(() => 'ffff')) }, ], prefixOrId: [ { message: 'length must be less than or equal to 64 characters long', transform: assocPath(['ids', 0], 'f'.repeat(65)) }, @@ -41,7 +40,6 @@ describe('NIP-01', () => { ], authors: [ { message: 'must be an array', transform: assocPath(['authors'], null) }, - { message: 'must contain less than or equal to 1000 items', transform: assocPath(['authors'], range(0, 1001).map(() => 'ffff')) }, ], prefixOrAuthor: [ { message: 'length must be less than or equal to 64 characters long', transform: assocPath(['authors', 0], 'f'.repeat(65)) }, @@ -50,7 +48,6 @@ describe('NIP-01', () => { ], kinds: [ { message: 'must be an array', transform: assocPath(['kinds'], null) }, - { message: 'must contain less than or equal to 20 items', transform: assocPath(['kinds'], range(0, 21).map(() => 1)) }, ], kind: [ { message: 'must be greater than or equal to 0', transform: assocPath(['kinds', 0], -1) }, @@ -73,11 +70,9 @@ describe('NIP-01', () => { { message: 'must be a number', transform: assocPath(['limit'], null) }, { message: 'must be greater than or equal to 0', transform: assocPath(['limit'], -1) }, { message: 'must be a multiple of 1', transform: assocPath(['limit'], Math.PI) }, - { message: 'must be less than or equal to 5000', transform: assocPath(['limit'], 5001) }, ], '#e': [ { message: 'must be an array', transform: assocPath(['#e'], null) }, - { message: 'must contain less than or equal to 256 items', transform: assocPath(['#e'], range(0, 1024 + 1).map(() => 'f')) }, ], '#e[0]': [ { message: 'length must be less than or equal to 1024 characters long', transform: assocPath(['#e', 0], 'f'.repeat(1024 + 1)) }, @@ -85,7 +80,6 @@ describe('NIP-01', () => { ], '#p': [ { message: 'must be an array', transform: assocPath(['#p'], null) }, - { message: 'must contain less than or equal to 256 items', transform: assocPath(['#p'], range(0, 1024 + 1).map(() => 'f')) }, ], '#p[0]': [ { message: 'length must be less than or equal to 1024 characters long', transform: assocPath(['#p', 0], 'f'.repeat(1024 + 1)) }, @@ -93,7 +87,6 @@ describe('NIP-01', () => { ], '#r': [ { message: 'must be an array', transform: assocPath(['#r'], null) }, - { message: 'must contain less than or equal to 256 items', transform: assocPath(['#r'], range(0, 1024 + 1).map(() => 'f')) }, ], '#r[0]': [ { message: 'length must be less than or equal to 1024 characters long', transform: assocPath(['#r', 0], 'f'.repeat(1024 + 1)) }, diff --git a/test/unit/tor/onion.spec.ts b/test/unit/tor/onion.spec.ts index 6f9e6d09..ec1d8a5d 100644 --- a/test/unit/tor/onion.spec.ts +++ b/test/unit/tor/onion.spec.ts @@ -82,7 +82,7 @@ describe('onion',()=>{ sandbox.restore() }) - it('config emty',()=>{ + it('config empty',()=>{ const config = createTorConfig() expect(config).to.include({ port: 9051 }) }) @@ -109,7 +109,7 @@ describe('onion',()=>{ } expect(client).be.undefined }) - it('tor connect sucess',async ()=>{ + it('tor connect success',async ()=>{ //mockTor(sandbox) process.env.TOR_HOST = hostname() process.env.TOR_CONTROL_PORT = '9051' @@ -175,7 +175,7 @@ describe('onion',()=>{ console.log('domain: '+domain) expect(domain).be.undefined }) - it('add onion sucess read fail',async ()=>{ + it('add onion success read fail',async ()=>{ mock(sandbox,true) process.env.TOR_HOST = hostname() process.env.TOR_CONTROL_PORT = '9051' @@ -191,7 +191,7 @@ describe('onion',()=>{ console.log('domain: '+domain) expect(domain).be.not.undefined }) - it('add onion sucess',async ()=>{ + it('add onion success',async ()=>{ mock(sandbox) process.env.TOR_HOST = hostname() process.env.TOR_CONTROL_PORT = '9051' @@ -207,4 +207,4 @@ describe('onion',()=>{ console.log('domain: '+domain) expect(domain).be.not.undefined }) -}) \ No newline at end of file +}) diff --git a/test/unit/utils/event.spec.ts b/test/unit/utils/event.spec.ts index 0009decb..f845b5a5 100644 --- a/test/unit/utils/event.spec.ts +++ b/test/unit/utils/event.spec.ts @@ -3,8 +3,6 @@ import { expect } from 'chai' import { CanonicalEvent, Event } from '../../../src/@types/event' import { getEventExpiration, - isDelegatedEvent, - isDelegatedEventValid, isDeleteEvent, isEphemeralEvent, isEventIdValid, @@ -400,75 +398,6 @@ describe('NIP-16', () => { // }) // }) -describe('NIP-26', () => { - let event: Event - beforeEach(() => { - event = { - 'id': 'a080fd288b60ac2225ff2e2d815291bd730911e583e177302cc949a15dc2b2dc', - 'pubkey': '62903b1ff41559daf9ee98ef1ae67cc52f301bb5ce26d14baba3052f649c3f49', - 'created_at': 1660896109, - 'kind': 1, - 'tags': [ - [ - 'delegation', - '86f0689bd48dcd19c67a19d994f938ee34f251d8c39976290955ff585f2db42e', - 'kind=1&created_at>1640995200', - 'c33c88ba78ec3c760e49db591ac5f7b129e3887c8af7729795e85a0588007e5ac89b46549232d8f918eefd73e726cb450135314bfda419c030d0b6affe401ec1', - ], - ], - 'content': 'Hello world', - 'sig': 'cd4a3cd20dc61dcbc98324de561a07fd23b3d9702115920c0814b5fb822cc5b7c5bcdaf3fa326d24ed50c5b9c8214d66c75bae34e3a84c25e4d122afccb66eb6', - } - }) - - describe('isDelegatedEvent', () => { - it('returns true if event contains delegation tag', () => { - expect(isDelegatedEvent(event)).to.be.true - }) - }) - - describe('isDelegatedEventValid', () => { - it('resolves with true if delegated event is valid', async () => { - expect(await isDelegatedEventValid(event)).to.be.true - }) - - it('resolves with false if no delegation tag is found', async () => { - event.tags = [] - expect(await isDelegatedEventValid(event)).to.be.false - }) - - it('resolves with false if delegation signature is invalid', async () => { - event.tags[0][3] = 'f' - expect(await isDelegatedEventValid(event)).to.be.false - }) - - it('resolves with false if delegation rule is not a valid rune', async () => { - event.tags[0][2] = '@' - expect(await isDelegatedEventValid(event)).to.be.false - }) - - - it('resolves with false if no delegation rule does not match', async () => { - event.tags[0][2] = 'a=1' - expect(await isDelegatedEventValid(event)).to.be.false - }) - }) - - describe('isEventMatchingFilter', () => { - it('returns true if author is delegator', () => { - expect( - isEventMatchingFilter({ authors: ['86f0689bd48dcd19c67a19d994f938ee34f251d8c39976290955ff585f2db42e'] })(event) - ).to.be.true - }) - - it('returns false if author is not delegator', () => { - expect( - isEventMatchingFilter({ authors: ['e8b487c079b0f67c695ae6c4c2552a47f38adfa2533cc5926bd2c102942fdcb7'] })(event) - ).to.be.false - }) - }) -}) - describe('NIP-09', () => { describe('isDeleteEvent', () => { it('returns true if event is kind 5', () => { diff --git a/test/unit/utils/filter.ts b/test/unit/utils/filter.ts new file mode 100644 index 00000000..775dd426 --- /dev/null +++ b/test/unit/utils/filter.ts @@ -0,0 +1,21 @@ +import { expect } from 'chai' + +import { isGenericTagQuery } from '../../../src/utils/filter' + +describe('isGenericTagQuery', () => { + it('returns true for #a', () => { + expect(isGenericTagQuery('#a')).to.be.true + }) + + it('returns true for #A', () => { + expect(isGenericTagQuery('#A')).to.be.true + }) + + it('returns false for #0', () => { + expect(isGenericTagQuery('#0')).to.be.false + }) + + it('returns false for #abc', () => { + expect(isGenericTagQuery('#abc')).to.be.false + }) +})