diff --git a/.circleci/config.yml b/.circleci/config.yml index 8eff6f505b..1bb6d01ba1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,7 +84,8 @@ aliases: - oss-st-5 # OSS Standalone v5 - oss-st-5-pass # OSS Standalone v5 with admin pass required - oss-st-6 # OSS Standalone v6 and all modules - #- mods-preview # OSS Standalone and all preview modules // todo: uncomment after broken image will be fixed + - oss-st-big # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M) + - mods-preview # OSS Standalone and all preview modules - oss-st-6-tls # OSS Standalone v6 with TLS enabled - oss-st-6-tls-auth # OSS Standalone v6 with TLS auth required - oss-clu # OSS Cluster @@ -92,11 +93,18 @@ aliases: - oss-sent # OSS Sentinel - re-st # Redis Enterprise with Standalone inside - re-clu # Redis Enterprise with Cluster inside + - re-crdt # Redis Enterprise with active-active database inside + guides-filter: &guidesFilter + filters: + branches: + only: + - guides dev-filter: &devFilter filters: branches: only: - main + - /^build\/.*/ stage-filter: &stageFilter filters: branches: @@ -301,6 +309,7 @@ jobs: - run: name: Run tests command: | + TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \ docker-compose -f tests/e2e/docker-compose.yml -f tests/e2e/docker.docker-compose.yml up --abort-on-container-exit no_output_timeout: 5m - when: @@ -310,6 +319,7 @@ jobs: - run: name: Run tests command: | + TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \ docker-compose -f tests/e2e/docker-compose.yml up --abort-on-container-exit no_output_timeout: 5m - when: @@ -441,7 +451,7 @@ jobs: - release/*-linux.yml macosx: macos: - xcode: 11.3.0 + xcode: 13.2.1 parameters: env: description: Build environment (stage || prod) @@ -729,6 +739,17 @@ jobs: done + release-guides: + executor: linux-executor + steps: + - checkout + - run: + name: Release guides + command: | + cd ./redisinsight/ui/src/packages/enablement-area && zip -r data.zip . + mkdir -p _build && mv data.zip ./_build + echo "{\"timestamp\":$(date +%s)}" > ./_build/build.json + aws s3 cp _build/ s3://${AWS_BUCKET_NAME}/public/guides --recursive workflows: build: jobs: @@ -969,3 +990,13 @@ workflows: report: true requires: - Build docker image + guides: + jobs: + - guides-approve: + type: approval + name: Approve guides release + <<: *guidesFilter + - release-guides: + name: Build & release + requires: + - Approve guides release diff --git a/Dockerfile b/Dockerfile index e39716367a..1afdb0b558 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ COPY configs ./configs COPY scripts ./scripts COPY redisinsight ./redisinsight RUN SKIP_POSTINSTALL=1 yarn install +RUN yarn --cwd redisinsight/api RUN yarn build:web RUN yarn build:statics diff --git a/README.md b/README.md index 29f0749ddf..f5000342e9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Release](https://img.shields.io/github/v/release/RedisInsight/RedisInsight.svg?sort=semver)](https://github.com/RedisInsight/RedisInsight/releases) -[![CircleCI](https://circleci.com/gh/RedisInsight/RedisInsight/tree/master.svg?style=svg)](https://circleci.com/gh/RedisInsight/RedisInsighth/tree/master) +[![CircleCI](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main.svg?style=svg)](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main) [![Total alerts](https://img.shields.io/lgtm/alerts/g/RedisInsight/RedisInsight.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RedisInsight/RedisInsight/alerts/) # logo RedisInsight - Developer GUI for Redis, by Redis. diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js index 06deba8951..65e1d0f1c6 100644 --- a/configs/webpack.config.base.js +++ b/configs/webpack.config.base.js @@ -61,12 +61,12 @@ export default { // 'swagger-ui-express', // 'class-transformer', // 'class-transformer/storage', - '@nestjs/websockets', + // '@nestjs/websockets', // '@nestjs/core/adapters/http-adapter', // '@nestjs/core/helpers/router-method-factory', // '@nestjs/core/metadata-scanner', '@nestjs/microservices/microservices-module', - '@nestjs/websockets/socket-module', + // '@nestjs/websockets/socket-module', ]; if (!lazyImports.includes(resource)) { return false; diff --git a/configs/webpack.config.web.common.babel.js b/configs/webpack.config.web.common.babel.js index 936bc40509..0a2abdecb4 100644 --- a/configs/webpack.config.web.common.babel.js +++ b/configs/webpack.config.web.common.babel.js @@ -97,9 +97,9 @@ export default { 'reflect-metadata', 'swagger-ui-express', 'class-transformer/storage', - '@nestjs/websockets', + // '@nestjs/websockets', '@nestjs/microservices/microservices-module', - '@nestjs/websockets/socket-module', + // '@nestjs/websockets/socket-module', ]; if (!lazyImports.includes(resource)) { return false; diff --git a/docs/plugins/development.md b/docs/plugins/development.md index dcb6024e33..2036146112 100644 --- a/docs/plugins/development.md +++ b/docs/plugins/development.md @@ -103,7 +103,11 @@ The following function receives props of the executed commands: ```typescript interface Props { command: string; // executed command - data: string; // result of the executed command + data: Result[]; // array of results (one item for Standalone) +} + +interface Result { + response: any; // response of the executed command status: 'success' | 'fail'; // response status of the executed command } @@ -131,10 +135,11 @@ inside of the plugin script. ```javascript const { config, modules } = window.state -const { baseUrl } = config +const { baseUrl, appVersion } = config // modules - the list of modules of the current database // baseUrl - url for your plugin folder - can be used to include your assets +// appVersion - version of the RedisInsight application ``` ### Plugin rendering @@ -146,13 +151,16 @@ Rendered iframe also includes `theme_DARK` or `theme_LIGHT` className on `body` _Javascript Example:_ ```javascript const renderVisualization = (props) => { - const { command, data } = props; + const { command, data = [] } = props; + const [{ result, status }] = data document.getElementById('app') .innerHTML = `

Executed command:

${command}

Result of the command

-

${data}

+

${result}

+

Status of the command

+

${status}

` } @@ -165,9 +173,10 @@ import { render } from 'react-dom' import App from './App' const renderVisualization = (props) => { - const { command, status, data = '' } = props + const { command, data = [] } = props + const [{ result, status }] = data render( - , + , document.getElementById('app') ) } diff --git a/docs/plugins/introduction.md b/docs/plugins/introduction.md index d585af2ab1..59679c5e39 100644 --- a/docs/plugins/introduction.md +++ b/docs/plugins/introduction.md @@ -1,7 +1,17 @@ # Introduction to plugins for the Workbench -Plugins allow the customization of visualizations for Redis commands executed -in the Workbench inside the RedisInsight. +## Introduction + +Redis can hold a range of different data types. Visualizing these in a +format that’s convenient to you for validation and debugging is paramount. +You can now easily extend the core functionality of RedisInsight independently by +building your own custom visualization plugin. + +Data visualization provided by the plugin is rendered within the +Workbench results area and is based on the executed command, ie. a certain +Redis command can generate its own custom data visualization. + +We have included the following [plugin package example](https://github.com/RedisInsight/RedisInsight/tree/main/redisinsight/ui/src/packages/clients-list-example) for your reference: running the CLIENT LIST command presents the output in a tabular format for easier reading. ## Wiki diff --git a/electron-builder.json b/electron-builder.json index fc4e11687c..f9d4a57a86 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -24,7 +24,7 @@ "gatekeeperAssess": false }, "dmg": { - "artifactName": "${productName}-${os}-x64.${ext}", + "artifactName": "${productName}-${os}-${arch}.${ext}", "contents": [ { "x": 130, diff --git a/package.json b/package.json index a737e8a4d9..b09b41982f 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "monaco-editor": "/redisinsight/__mocks__/monacoMock.js", "unified": "/redisinsight/__mocks__/unified.js", "remark-parse": "/redisinsight/__mocks__/remarkParse.js", + "remark-gfm": "/redisinsight/__mocks__/remarkGfm.js", "remark-rehype": "/redisinsight/__mocks__/remarkRehype.js", "rehype-stringify": "/redisinsight/__mocks__/rehypeStringify.js", "unist-util-visit": "/redisinsight/__mocks__/unistUtilsVisit.js" @@ -205,6 +206,7 @@ "rimraf": "^3.0.2", "sass-loader": "^10.1.0", "skip-postinstall": "^1.0.0", + "socket.io-mock": "^1.3.2", "source-map-support": "^0.5.19", "style-loader": "^2.0.0", "supertest": "^4.0.2", @@ -251,8 +253,10 @@ "react-router-dom": "^5.2.0", "react-virtualized": "^9.22.2", "rehype-stringify": "^9.0.2", + "remark-gfm": "^3.0.1", "remark-parse": "^10.0.1", "remark-rehype": "^10.0.1", + "socket.io-client": "^4.4.0", "unified": "^10.1.1", "unist-util-visit": "^4.1.0" }, diff --git a/redisinsight/__mocks__/remarkGfm.js b/redisinsight/__mocks__/remarkGfm.js new file mode 100644 index 0000000000..bbabe6d0d1 --- /dev/null +++ b/redisinsight/__mocks__/remarkGfm.js @@ -0,0 +1 @@ +export default jest.fn() diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts index f51f4fde4c..8490f4c85b 100644 --- a/redisinsight/api/config/default.ts +++ b/redisinsight/api/config/default.ts @@ -21,6 +21,8 @@ export default { pluginsAssets: join(staticDir, 'resources', 'plugins'), commands: join(homedir, 'commands'), defaultCommandsDir: join(defaultsDir, 'commands'), + enablementArea: join(homedir, 'enablement-area'), + defaultEnablementArea: join(defaultsDir, 'enablement-area'), caCertificates: join(homedir, 'ca_certificates'), clientCertificates: join(homedir, 'client_certificates'), }, @@ -31,6 +33,7 @@ export default { globalPrefix: 'api', customPluginsUri: '/plugins', staticUri: '/static', + enablementAreaUri: '/static/workbench', defaultPluginsUri: '/static/plugins', pluginsAssetsUri: '/static/resources/plugins', secretStoragePassword: process.env.SECRET_STORAGE_PASSWORD, @@ -42,6 +45,10 @@ export default { appVersion: process.env.APP_VERSION || '2.0.0', requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 10000, }, + sockets: { + cors: process.env.SOCKETS_CORS ? process.env.SOCKETS_CORS === 'true' : false, + serveClient: process.env.SOCKETS_SERVE_CLIENT ? process.env.SOCKETS_SERVE_CLIENT === 'true' : false, + }, db: { database: join(homedir, 'redisinsight.db'), synchronize: process.env.DB_SYNC ? process.env.DB_SYNC === 'true' : false, @@ -78,6 +85,20 @@ export default { omitSensitiveData: process.env.LOGGER_OMIT_DATA ? process.env.LOGGER_OMIT_DATA === 'true' : true, pipelineSummaryLimit: parseInt(process.env.LOGGER_PIPELINE_SUMMARY_LIMIT, 10) || 5, }, + plugins: { + stateMaxSize: parseInt(process.env.PLUGIN_STATE_MAX_SIZE, 10) || 1024 * 1024, + }, + enablementArea: { + updateUrl: process.env.ENABLEMENT_AREA_UPDATE_URL + || 'https://s3.amazonaws.com/redisinsight.download/public/guides', + zip: process.env.ENABLEMENT_AREA_ZIP || 'data.zip', + buildInfo: process.env.ENABLEMENT_AREA_CHECKSUM || 'build.json', + }, + workbench: { + maxResultSize: parseInt(process.env.COMMAND_EXECUTION_MAX_RESULT_SIZE, 10) || 1024 * 1024, + maxItemsPerDb: parseInt(process.env.COMMAND_EXECUTION_MAX_ITEMS_PER_DB, 10) || 30, + unsupportedCommands: JSON.parse(process.env.WORKBENCH_UNSUPPORTED_COMMANDS || '[]'), + }, commands: [ { name: 'main', @@ -109,5 +130,15 @@ export default { url: process.env.COMMANDS_REDISGRAPH_URL || 'https://raw.githubusercontent.com/RedisGraph/RedisGraph/master/commands.json', }, + { + name: 'redisgears', + url: process.env.COMMANDS_REDISGEARS_URL + || 'https://raw.githubusercontent.com/RedisGears/RedisGears/master/commands.json', + }, + { + name: 'redisbloom', + url: process.env.COMMANDS_REDISBLOOM_URL + || 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json', + }, ], }; diff --git a/redisinsight/api/config/development.ts b/redisinsight/api/config/development.ts index 56ac010fc2..83e0d610ba 100644 --- a/redisinsight/api/config/development.ts +++ b/redisinsight/api/config/development.ts @@ -2,6 +2,9 @@ export default { server: { tls: process.env.SERVER_TLS ? process.env.SERVER_TLS === 'true' : false, }, + sockets: { + cors: true, + }, db: { synchronize: process.env.DB_SYNC ? process.env.DB_SYNC === 'true' : true, migrationsRun: process.env.DB_MIGRATIONS ? process.env.DB_MIGRATIONS === 'true' : false, diff --git a/redisinsight/api/config/ormconfig.ts b/redisinsight/api/config/ormconfig.ts index e751abe7da..da5da99d25 100644 --- a/redisinsight/api/config/ormconfig.ts +++ b/redisinsight/api/config/ormconfig.ts @@ -5,6 +5,8 @@ import { ClientCertificateEntity } from 'src/modules/core/models/client-certific import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity'; import { ServerEntity } from 'src/modules/core/models/server.entity'; import { SettingsEntity } from 'src/modules/core/models/settings.entity'; +import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity'; +import { PluginStateEntity } from 'src/modules/workbench/entities/plugin-state.entity'; import migrations from '../migration'; import * as config from '../src/utils/config'; @@ -21,6 +23,8 @@ const ormConfig: TypeOrmModuleOptions = { DatabaseInstanceEntity, ServerEntity, SettingsEntity, + CommandExecutionEntity, + PluginStateEntity, ], migrations, cli: { diff --git a/redisinsight/api/config/production.ts b/redisinsight/api/config/production.ts index d74018b3ba..d70949ee9d 100644 --- a/redisinsight/api/config/production.ts +++ b/redisinsight/api/config/production.ts @@ -8,6 +8,7 @@ export default { logs: join(homedir, 'logs'), customPlugins: join(homedir, 'plugins'), commands: join(homedir, 'commands'), + enablementArea: join(homedir, 'enablement-area'), caCertificates: join(homedir, 'ca_certificates'), clientCertificates: join(homedir, 'client_certificates'), }, diff --git a/redisinsight/api/config/staging.ts b/redisinsight/api/config/staging.ts index 4ac34c06d9..a36681b22d 100644 --- a/redisinsight/api/config/staging.ts +++ b/redisinsight/api/config/staging.ts @@ -8,6 +8,7 @@ export default { logs: join(homedir, 'logs'), customPlugins: join(homedir, 'plugins'), commands: join(homedir, 'commands'), + enablementArea: join(homedir, 'enablement-area'), caCertificates: join(homedir, 'ca_certificates'), clientCertificates: join(homedir, 'client_certificates'), }, diff --git a/redisinsight/api/config/test.ts b/redisinsight/api/config/test.ts index 48f5df49c7..dd0d3424ed 100644 --- a/redisinsight/api/config/test.ts +++ b/redisinsight/api/config/test.ts @@ -1,18 +1,6 @@ -import { join } from 'path'; - -const homedir = join(__dirname, '..'); - -module.exports = { - dir_path: { - homedir, - logs: join(homedir, 'logs'), - caCertificates: join(homedir, 'ca_certificates'), - clientCertificates: join(homedir, 'client_certificates'), - }, +export default { server: { env: 'test', - tls: !!process.env.SERVER_TLS || true, - tlsCert: process.env.SERVER_TLS_CERT, - tlsKey: process.env.SERVER_TLS_KEY, + requestTimeout: 1000, }, }; diff --git a/redisinsight/api/migration/1641795882696-command-execution.ts b/redisinsight/api/migration/1641795882696-command-execution.ts new file mode 100644 index 0000000000..4599fc4761 --- /dev/null +++ b/redisinsight/api/migration/1641795882696-command-execution.ts @@ -0,0 +1,28 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class commandExecution1641795882696 implements MigrationInterface { + name = 'commandExecution1641795882696' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')))`); + await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `); + await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`); + await queryRunner.query(`CREATE TABLE "temporary_command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_ea8adfe9aceceb79212142206b8" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`); + await queryRunner.query(`INSERT INTO "temporary_command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt" FROM "command_execution"`); + await queryRunner.query(`DROP TABLE "command_execution"`); + await queryRunner.query(`ALTER TABLE "temporary_command_execution" RENAME TO "command_execution"`); + await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`); + await queryRunner.query(`ALTER TABLE "command_execution" RENAME TO "temporary_command_execution"`); + await queryRunner.query(`CREATE TABLE "command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')))`); + await queryRunner.query(`INSERT INTO "command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt" FROM "temporary_command_execution"`); + await queryRunner.query(`DROP TABLE "temporary_command_execution"`); + await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `); + await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`); + await queryRunner.query(`DROP TABLE "command_execution"`); + } + +} diff --git a/redisinsight/api/migration/1641805606399-plugin-state.ts b/redisinsight/api/migration/1641805606399-plugin-state.ts new file mode 100644 index 0000000000..6403d01841 --- /dev/null +++ b/redisinsight/api/migration/1641805606399-plugin-state.ts @@ -0,0 +1,22 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class pluginState1641805606399 implements MigrationInterface { + name = 'pluginState1641805606399' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "plugin_state" ("commandExecutionId" varchar NOT NULL, "visualizationId" varchar NOT NULL, "state" text NOT NULL, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), PRIMARY KEY ("commandExecutionId", "visualizationId"))`); + await queryRunner.query(`CREATE TABLE "temporary_plugin_state" ("commandExecutionId" varchar NOT NULL, "visualizationId" varchar NOT NULL, "state" text NOT NULL, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_91b21bec94d7107162e34a03ceb" FOREIGN KEY ("commandExecutionId") REFERENCES "command_execution" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, PRIMARY KEY ("commandExecutionId", "visualizationId"))`); + await queryRunner.query(`INSERT INTO "temporary_plugin_state"("commandExecutionId", "visualizationId", "state", "encryption", "createdAt", "updatedAt") SELECT "commandExecutionId", "visualizationId", "state", "encryption", "createdAt", "updatedAt" FROM "plugin_state"`); + await queryRunner.query(`DROP TABLE "plugin_state"`); + await queryRunner.query(`ALTER TABLE "temporary_plugin_state" RENAME TO "plugin_state"`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "plugin_state" RENAME TO "temporary_plugin_state"`); + await queryRunner.query(`CREATE TABLE "plugin_state" ("commandExecutionId" varchar NOT NULL, "visualizationId" varchar NOT NULL, "state" text NOT NULL, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), PRIMARY KEY ("commandExecutionId", "visualizationId"))`); + await queryRunner.query(`INSERT INTO "plugin_state"("commandExecutionId", "visualizationId", "state", "encryption", "createdAt", "updatedAt") SELECT "commandExecutionId", "visualizationId", "state", "encryption", "createdAt", "updatedAt" FROM "temporary_plugin_state"`); + await queryRunner.query(`DROP TABLE "temporary_plugin_state"`); + await queryRunner.query(`DROP TABLE "plugin_state"`); + } + +} diff --git a/redisinsight/api/migration/index.ts b/redisinsight/api/migration/index.ts index 219c9539b2..07e4cfce5e 100644 --- a/redisinsight/api/migration/index.ts +++ b/redisinsight/api/migration/index.ts @@ -10,6 +10,8 @@ import { settings1627556171227 } from './1627556171227-settings'; import { databaseModules1629729923740 } from './1629729923740-database-modules'; import { databaseDbIndex1634219846022 } from './1634219846022-database-db-index'; import { encryption1634557312500 } from './1634557312500-encryption'; +import { commandExecution1641795882696 } from './1641795882696-command-execution'; +import { pluginState1641805606399 } from './1641805606399-plugin-state'; export default [ initialMigration1614164490968, @@ -24,4 +26,6 @@ export default [ databaseModules1629729923740, databaseDbIndex1634219846022, encryption1634557312500, + commandExecution1641795882696, + pluginState1641805606399, ]; diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json index 9b806cbc4d..e69746a715 100644 --- a/redisinsight/api/package.json +++ b/redisinsight/api/package.json @@ -10,7 +10,8 @@ }, "scripts": { "build:defaults:commands": "ts-node ./scripts/default-commands.ts", - "build:defaults": "yarn build:defaults:commands", + "build:defaults:enablement-area": "ts-node ./scripts/default-enablement-area.ts", + "build:defaults": "yarn build:defaults:enablement-area && yarn build:defaults:commands", "prebuild": "rimraf dist", "build": "nest build", "build:prod": "rimraf dist && nest build -p ./tsconfig.build.prod.json && cross-env NODE_ENV=production", @@ -22,9 +23,9 @@ "start:debug": "nest start --debug --watch", "start:stage": "cross-env NODE_ENV=staging SERVER_STATIC_CONTENT=true node dist/src/main", "start:prod": "cross-env NODE_ENV=production node dist/src/main", - "test": "./node_modules/.bin/jest -w 1", - "test:watch": "jest --watch -w 1", - "test:cov": "./node_modules/.bin/jest --coverage -w 1", + "test": "cross-env NODE_ENV=test ./node_modules/.bin/jest -w 1", + "test:watch": "cross-env NODE_ENV=test jest --watch -w 1", + "test:cov": "cross-env NODE_ENV=test ./node_modules/.bin/jest --coverage -w 1", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand -w 1", "test:e2e": "jest --config ./test/jest-e2e.json -w 1", "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js --config ./config/ormconfig.ts", @@ -39,9 +40,12 @@ "@nestjs/core": "^7.0.0", "@nestjs/event-emitter": "^1.0.0", "@nestjs/platform-express": "^7.0.0", + "@nestjs/platform-socket.io": "^8.2.3", "@nestjs/serve-static": "^2.1.3", "@nestjs/swagger": "^4.6.1", "@nestjs/typeorm": "^7.1.5", + "@nestjs/websockets": "^8.2.3", + "adm-zip": "^0.5.9", "analytics-node": "^4.0.1", "axios": "^0.21.0", "body-parser": "^1.19.0", @@ -58,6 +62,7 @@ "nest-winston": "^1.4.0", "reflect-metadata": "^0.1.13", "rxjs": "^6.6.7", + "socket.io": "^4.4.0", "source-map-support": "^0.5.19", "sqlite3": "^5.0.2", "swagger-ui-express": "^4.1.4", @@ -77,6 +82,7 @@ "@types/jest": "^26.0.15", "@types/lodash": "^4.14.167", "@types/node": "14.14.10", + "@types/socket.io": "^3.0.2", "@types/supertest": "^2.0.8", "@typescript-eslint/eslint-plugin": "^4.8.1", "@typescript-eslint/parser": "^4.8.1", @@ -99,6 +105,7 @@ "nyc": "^15.1.0", "object-diff": "^0.0.4", "rimraf": "^3.0.2", + "socket.io-mock": "^1.3.2", "supertest": "^4.0.2", "ts-jest": "^26.1.0", "ts-loader": "^6.2.1", diff --git a/redisinsight/api/scripts/default-enablement-area.ts b/redisinsight/api/scripts/default-enablement-area.ts new file mode 100644 index 0000000000..f122c20807 --- /dev/null +++ b/redisinsight/api/scripts/default-enablement-area.ts @@ -0,0 +1,56 @@ +import axios from 'axios'; +import * as fs from 'fs-extra'; +import * as path from 'path'; +import { join } from 'path'; +import * as AdmZip from 'adm-zip'; +import * as config from '../src/utils/config'; + +const PATH_CONFIG = config.get('dir_path'); +const ENABLEMENT_AREA_CONFIG = config.get('enablementArea'); + +async function init() { + try { + await fs.remove(PATH_CONFIG.defaultEnablementArea); + + await fs.ensureDir(PATH_CONFIG.defaultEnablementArea); + + // get archive + const { data } = await axios.get( + new URL(path.join( + ENABLEMENT_AREA_CONFIG.updateUrl, + ENABLEMENT_AREA_CONFIG.zip, + )).toString(), + { + responseType: 'arraybuffer', + }, + ); + + // extract archive to default folder + const zip = new AdmZip(data); + zip.extractAllTo(PATH_CONFIG.defaultEnablementArea, true); + + // get build info + const { data: buildInfo } = await axios.get( + new URL(path.join( + ENABLEMENT_AREA_CONFIG.updateUrl, + ENABLEMENT_AREA_CONFIG.buildInfo, + )).toString(), + { + responseType: 'arraybuffer', + }, + ); + + // save build info to default folder + await fs.writeFile( + join(PATH_CONFIG.defaultEnablementArea, ENABLEMENT_AREA_CONFIG.buildInfo), + buildInfo, + ); + + process.exit(0); + } catch (e) { + console.error('Something went wrong trying to get default enablement area archive', e); + process.exit(1); + } +} + +init(); diff --git a/redisinsight/api/src/__mocks__/common.ts b/redisinsight/api/src/__mocks__/common.ts index a94617317c..094eece7f7 100644 --- a/redisinsight/api/src/__mocks__/common.ts +++ b/redisinsight/api/src/__mocks__/common.ts @@ -20,10 +20,18 @@ export const mockRedisClusterConsumer = () => ({ export const mockQueryBuilderGetOne = jest.fn(); export const mockQueryBuilderGetMany = jest.fn(); +export const mockQueryBuilderGetManyRaw = jest.fn(); export const mockCreateQueryBuilder = jest.fn(() => ({ where: jest.fn().mockReturnThis(), select: jest.fn().mockReturnThis(), + orderBy: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), leftJoin: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + delete: jest.fn().mockReturnThis(), + whereInIds: jest.fn().mockReturnThis(), + execute: jest.fn().mockReturnThis(), + getRawMany: mockQueryBuilderGetManyRaw, getMany: mockQueryBuilderGetMany, getOne: mockQueryBuilderGetOne, })); diff --git a/redisinsight/api/src/__mocks__/monitor.ts b/redisinsight/api/src/__mocks__/monitor.ts new file mode 100644 index 0000000000..a0c4432c3f --- /dev/null +++ b/redisinsight/api/src/__mocks__/monitor.ts @@ -0,0 +1,36 @@ +import { v4 as uuidv4 } from 'uuid'; +import { IClientMonitorObserver } from 'src/modules/monitor/helpers/client-monitor-observer'; +import { IMonitorObserver, IShardObserver, MonitorObserverStatus } from 'src/modules/monitor/helpers/monitor-observer'; + +export const mockClientMonitorObserver: IClientMonitorObserver = { + id: uuidv4(), + handleOnData: jest.fn(), + handleOnDisconnect: jest.fn(), +}; + +export const mockMonitorObserver: IMonitorObserver = { + status: MonitorObserverStatus.Wait, + subscribe: jest.fn(), + unsubscribe: jest.fn(), + getSize: jest.fn(), + clear: jest.fn(), +}; + +export const mockRedisMonitorObserver: IShardObserver = { + addListener: jest.fn(), + eventNames: jest.fn(), + getMaxListeners: jest.fn(), + listenerCount: jest.fn(), + listeners: jest.fn(), + prependListener: jest.fn(), + prependOnceListener: jest.fn(), + removeAllListeners: jest.fn(), + removeListener: jest.fn(), + rawListeners: jest.fn(), + setMaxListeners: jest.fn(), + on: jest.fn(), + emit: jest.fn(), + off: jest.fn(), + once: jest.fn(), + disconnect: jest.fn(), +}; diff --git a/redisinsight/api/src/app.module.ts b/redisinsight/api/src/app.module.ts index d3cad4134e..e093ffb13e 100644 --- a/redisinsight/api/src/app.module.ts +++ b/redisinsight/api/src/app.module.ts @@ -8,11 +8,14 @@ import { join } from 'path'; import config from 'src/utils/config'; import { PluginModule } from 'src/modules/plugin/plugin.module'; import { CommandsModule } from 'src/modules/commands/commands.module'; +import { WorkbenchModule } from 'src/modules/workbench/workbench.module'; +import { EnablementAreaModule } from 'src/modules/enablement-area/enablement-area.module'; import { SharedModule } from './modules/shared/shared.module'; import { InstancesModule } from './modules/instances/instances.module'; import { BrowserModule } from './modules/browser/browser.module'; import { RedisEnterpriseModule } from './modules/redis-enterprise/redis-enterprise.module'; import { RedisSentinelModule } from './modules/redis-sentinel/redis-sentinel.module'; +import { MonitorModule } from './modules/monitor/monitor.module'; import { CliModule } from './modules/cli/cli.module'; import { SettingsController } from './controllers/settings.controller'; import { ServerInfoController } from './controllers/server-info.controller'; @@ -32,8 +35,10 @@ const PATH_CONFIG = config.get('dir_path'); RedisSentinelModule, BrowserModule, CliModule, + WorkbenchModule, PluginModule, CommandsModule, + MonitorModule, EventEmitterModule.forRoot(), ...(SERVER_CONFIG.staticContent ? [ @@ -59,6 +64,7 @@ const PATH_CONFIG = config.get('dir_path'); fallthrough: false, }, }), + EnablementAreaModule, ], controllers: [SettingsController, ServerInfoController], providers: [], diff --git a/redisinsight/api/src/app.routes.ts b/redisinsight/api/src/app.routes.ts index 0fa43c4cee..d49843e4db 100644 --- a/redisinsight/api/src/app.routes.ts +++ b/redisinsight/api/src/app.routes.ts @@ -4,6 +4,7 @@ import { BrowserModule } from 'src/modules/browser/browser.module'; import { RedisEnterpriseModule } from 'src/modules/redis-enterprise/redis-enterprise.module'; import { RedisSentinelModule } from 'src/modules/redis-sentinel/redis-sentinel.module'; import { CliModule } from 'src/modules/cli/cli.module'; +import { WorkbenchModule } from 'src/modules/workbench/workbench.module'; export const routes: Routes = [ { @@ -18,6 +19,10 @@ export const routes: Routes = [ path: '/:dbInstance', module: CliModule, }, + { + path: '/:dbInstance', + module: WorkbenchModule, + }, ], }, { diff --git a/redisinsight/api/src/constants/app-events.ts b/redisinsight/api/src/constants/app-events.ts index 96121896d1..e7c6b47cfb 100644 --- a/redisinsight/api/src/constants/app-events.ts +++ b/redisinsight/api/src/constants/app-events.ts @@ -2,3 +2,7 @@ export enum AppAnalyticsEvents { Initialize = 'analytics.initialize', Track = 'analytics.track', } + +export enum AppRedisInstanceEvents { + Deleted = 'instance.deleted', +} diff --git a/redisinsight/api/src/constants/error-messages.ts b/redisinsight/api/src/constants/error-messages.ts index 99decbe833..4f8f71f5ec 100644 --- a/redisinsight/api/src/constants/error-messages.ts +++ b/redisinsight/api/src/constants/error-messages.ts @@ -1,6 +1,8 @@ /* eslint-disable max-len */ export default { INVALID_DATABASE_INSTANCE_ID: 'Invalid database instance id.', + COMMAND_EXECUTION_NOT_FOUND: 'Command execution was not found.', + PLUGIN_STATE_NOT_FOUND: 'Plugin state was not found.', UNDEFINED_INSTANCE_ID: 'Undefined redis database instance id.', NO_CONNECTION_TO_REDIS_DB: 'No connection to the Redis Database.', WRONG_DATABASE_TYPE: 'Wrong database type.', @@ -35,6 +37,10 @@ export default { SCAN_PER_KEY_TYPE_NOT_SUPPORT: () => 'Filtering per Key types is available for Redis databases v. 6.0 or later.', WRONG_DISCOVERY_TOOL: () => 'Selected discovery tool is incorrect, please add this database manually using Host and Port.', COMMAND_NOT_SUPPORTED: (command: string) => `Redis does not support '${command}' command.`, + PLUGIN_COMMAND_NOT_SUPPORTED: (command: string) => `Plugin ERROR: The '${command}' command is not allowed by the RedisInsight Plugins.`, + PLUGIN_STATE_MAX_SIZE: (size: number) => `State should be less then ${size} bytes.`, + WORKBENCH_COMMAND_NOT_SUPPORTED: (command) => `Workbench ERROR: The '${command}' command is not supported by the RedisInsight Workbench.`, + WORKBENCH_RESPONSE_TOO_BIG: () => 'Results have been deleted since they exceed 1 MB. Re-run the command to see new results.', CLI_COMMAND_NOT_SUPPORTED: (command: string) => `CLI ERROR: The '${command}' command is not supported by the RedisInsight CLI.`, CLI_UNTERMINATED_QUOTES: () => 'Invalid argument(s): Unterminated quotes.', CLI_INVALID_QUOTES_CLOSING: () => 'Invalid argument(s): Closing quote must be followed by a space or nothing at all.', diff --git a/redisinsight/api/src/controllers/server-info.controller.ts b/redisinsight/api/src/controllers/server-info.controller.ts index ec06d958d2..cdc1610223 100644 --- a/redisinsight/api/src/controllers/server-info.controller.ts +++ b/redisinsight/api/src/controllers/server-info.controller.ts @@ -7,10 +7,8 @@ import { } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator'; -import { - getBlockingCommands, - getUnsupportedCommands, -} from 'src/utils/cli-helper'; +import { getBlockingCommands } from 'src/utils/cli-helper'; +import { getUnsupportedCommands } from 'src/modules/cli/utils/getUnsupportedCommands'; import { IServerProvider } from 'src/modules/core/models/server-provider.interface'; import { GetServerInfoResponse } from 'src/dto/server.dto'; diff --git a/redisinsight/api/src/models/redis-client.ts b/redisinsight/api/src/models/redis-client.ts index dac56f2890..ec2d15dd5e 100644 --- a/redisinsight/api/src/models/redis-client.ts +++ b/redisinsight/api/src/models/redis-client.ts @@ -13,6 +13,7 @@ export enum AppTool { Common = 'Common', Browser = 'Browser', CLI = 'CLI', + Workbench = 'Workbench', } export class IRedisModule { diff --git a/redisinsight/api/src/modules/cli/cli.module.ts b/redisinsight/api/src/modules/cli/cli.module.ts index 1a91bfadde..94f5dd2914 100644 --- a/redisinsight/api/src/modules/cli/cli.module.ts +++ b/redisinsight/api/src/modules/cli/cli.module.ts @@ -2,9 +2,11 @@ import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common'; import { RouterModule } from 'nest-router'; import { SharedModule } from 'src/modules/shared/shared.module'; import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; +import { RedisToolFactory } from 'src/modules/shared/services/base/redis-tool.factory'; +import { AppTool } from 'src/models'; import { CliController } from './controllers/cli.controller'; import { CliBusinessService } from './services/cli-business/cli-business.service'; -import { CliToolService } from './services/cli-tool/cli-tool.service'; import { CliAnalyticsService } from './services/cli-analytics/cli-analytics.service'; @Module({ @@ -12,8 +14,15 @@ import { CliAnalyticsService } from './services/cli-analytics/cli-analytics.serv controllers: [CliController], providers: [ CliBusinessService, - CliToolService, CliAnalyticsService, + { + provide: RedisToolService, + useFactory: (redisToolFactory: RedisToolFactory) => redisToolFactory.createRedisTool( + AppTool.CLI, + { enableAutoConnection: false }, + ), + inject: [RedisToolFactory], + }, ], }) export class CliModule implements NestModule { diff --git a/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.spec.ts b/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.spec.ts index def69fea95..347c29122c 100644 --- a/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.spec.ts +++ b/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.spec.ts @@ -5,8 +5,8 @@ import { mockRedisWrongTypeError, mockStandaloneDatabaseEntity } from 'src/__moc import { TelemetryEvents } from 'src/constants'; import { AppTool, ReplyError } from 'src/models'; import { CliParsingError } from 'src/modules/cli/constants/errors'; -import { ICliExecResultFromNode } from 'src/modules/cli/services/cli-tool/cli-tool.service'; import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { ICliExecResultFromNode } from 'src/modules/shared/services/base/redis-tool.service'; import { CliAnalyticsService } from './cli-analytics.service'; const redisReplyError: ReplyError = { diff --git a/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.ts b/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.ts index a3d4ad00fd..8382d02725 100644 --- a/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.ts +++ b/redisinsight/api/src/modules/cli/services/cli-analytics/cli-analytics.service.ts @@ -4,7 +4,7 @@ import { TelemetryEvents } from 'src/constants'; import { TelemetryBaseService } from 'src/modules/shared/services/base/telemetry.base.service'; import { AppTool, ReplyError } from 'src/models'; import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; -import { ICliExecResultFromNode } from 'src/modules/cli/services/cli-tool/cli-tool.service'; +import { ICliExecResultFromNode } from 'src/modules/shared/services/base/redis-tool.service'; @Injectable() export class CliAnalyticsService extends TelemetryBaseService { diff --git a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts index 4aaacd1031..81fb35b54b 100644 --- a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts +++ b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts @@ -21,14 +21,14 @@ import { } from 'src/modules/cli/dto/cli.dto'; import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; import { ReplyError } from 'src/models'; -import { CliToolUnsupportedCommands } from 'src/utils/cli-helper'; +import { CliToolUnsupportedCommands } from 'src/modules/cli/utils/getUnsupportedCommands'; import { EndpointDto } from 'src/modules/instances/dto/database-instance.dto'; import { ClusterNodeNotFoundError, WrongDatabaseTypeError } from 'src/modules/cli/constants/errors'; import { CliAnalyticsService } from 'src/modules/cli/services/cli-analytics/cli-analytics.service'; import { KeytarUnavailableException } from 'src/modules/core/encryption/exceptions'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; import { OutputFormatterManager } from './output-formatter/output-formatter-manager'; import { CliOutputFormatterTypes, IOutputFormatterStrategy } from './output-formatter/output-formatter.interface'; -import { CliToolService } from '../cli-tool/cli-tool.service'; import { CliBusinessService } from './cli-business.service'; const mockClientOptions: IFindRedisClientInstanceByOptions = { @@ -72,14 +72,14 @@ describe('CliBusinessService', () => { useFactory: mockCliAnalyticsService, }, { - provide: CliToolService, + provide: RedisToolService, useFactory: mockRedisConsumer, }, ], }).compile(); service = module.get(CliBusinessService); - cliTool = module.get(CliToolService); + cliTool = module.get(RedisToolService); const outputFormatterManager: OutputFormatterManager = get( service, 'outputFormatterManager', diff --git a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts index 66c0ed3b32..a9d017cce5 100644 --- a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts +++ b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts @@ -4,7 +4,6 @@ import { InternalServerErrorException, Logger, } from '@nestjs/common'; -import { CliToolService } from 'src/modules/cli/services/cli-tool/cli-tool.service'; import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; import { ClusterNodeRole, @@ -21,7 +20,6 @@ import ERROR_MESSAGES from 'src/constants/error-messages'; import { checkHumanReadableCommands, checkRedirectionError, - getUnsupportedCommands, parseRedirectionError, splitCliCommandLine, } from 'src/utils/cli-helper'; @@ -34,6 +32,9 @@ import { import { CliAnalyticsService } from 'src/modules/cli/services/cli-analytics/cli-analytics.service'; import { EncryptionServiceErrorException } from 'src/modules/core/encryption/exceptions'; import { AppTool } from 'src/models'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; +import { getUnsupportedCommands } from 'src/modules/cli/utils/getUnsupportedCommands'; +import { ClientNotFoundErrorException } from 'src/modules/shared/exceptions/client-not-found-error.exception'; import { OutputFormatterManager } from './output-formatter/output-formatter-manager'; import { CliOutputFormatterTypes } from './output-formatter/output-formatter.interface'; import { TextFormatterStrategy } from './output-formatter/strategies/text-formatter.strategy'; @@ -46,7 +47,7 @@ export class CliBusinessService { private outputFormatterManager: OutputFormatterManager; constructor( - private cliTool: CliToolService, + private cliTool: RedisToolService, private cliAnalyticsService: CliAnalyticsService, ) { this.outputFormatterManager = new OutputFormatterManager(); @@ -178,7 +179,7 @@ export class CliBusinessService { } this.cliAnalyticsService.sendConnectionErrorEvent(clientOptions.instanceId, namespace, error); - if (error instanceof EncryptionServiceErrorException) { + if (error instanceof EncryptionServiceErrorException || error instanceof ClientNotFoundErrorException) { throw error; } @@ -263,7 +264,7 @@ export class CliBusinessService { this.cliAnalyticsService.sendConnectionErrorEvent(clientOptions.instanceId, namespace, error); - if (error instanceof EncryptionServiceErrorException) { + if (error instanceof EncryptionServiceErrorException || error instanceof ClientNotFoundErrorException) { throw error; } @@ -331,7 +332,7 @@ export class CliBusinessService { this.cliAnalyticsService.sendConnectionErrorEvent(clientOptions.instanceId, 'cli', error); - if (error instanceof EncryptionServiceErrorException) { + if (error instanceof EncryptionServiceErrorException || error instanceof ClientNotFoundErrorException) { throw error; } diff --git a/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.spec.ts b/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.spec.ts new file mode 100644 index 0000000000..5617d3eb8c --- /dev/null +++ b/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.spec.ts @@ -0,0 +1,9 @@ +import { getUnsupportedCommands } from './getUnsupportedCommands'; + +describe('cli unsupported commands', () => { + it('should return correct list', () => { + const expectedResult = ['monitor', 'subscribe', 'psubscribe', 'sync', 'psync', 'script debug']; + + expect(getUnsupportedCommands()).toEqual(expectedResult); + }); +}); diff --git a/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.ts b/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.ts new file mode 100644 index 0000000000..75fed48aa0 --- /dev/null +++ b/redisinsight/api/src/modules/cli/utils/getUnsupportedCommands.ts @@ -0,0 +1,17 @@ +import config from 'src/utils/config'; + +const REDIS_CLI_CONFIG = config.get('redis_cli'); + +export enum CliToolUnsupportedCommands { + Monitor = 'monitor', + Subscribe = 'subscribe', + PSubscribe = 'psubscribe', + Sync = 'sync', + PSync = 'psync', + ScriptDebug = 'script debug', +} + +export const getUnsupportedCommands = (): string[] => [ + ...Object.values(CliToolUnsupportedCommands), + ...REDIS_CLI_CONFIG.unsupportedCommands, +]; diff --git a/redisinsight/api/src/modules/core/core.module.ts b/redisinsight/api/src/modules/core/core.module.ts index 8205bd9885..43dfefce74 100644 --- a/redisinsight/api/src/modules/core/core.module.ts +++ b/redisinsight/api/src/modules/core/core.module.ts @@ -2,6 +2,7 @@ import { DynamicModule, Global, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { CaCertificateEntity } from 'src/modules/core/models/ca-certificate.entity'; import { ClientCertificateEntity } from 'src/modules/core/models/client-certificate.entity'; +import { PlainEncryptionStrategy } from 'src/modules/core/encryption/strategies/plain-encryption.strategy'; import { AgreementsRepository } from './repositories/agreements.repository'; import { ServerRepository } from './repositories/server.repository'; import { SettingsRepository } from './repositories/settings.repository'; @@ -9,7 +10,6 @@ import settingsOnPremiseFactory from './providers/settings-on-premise'; import serverOnPremiseFactory from './providers/server-on-premise'; import { EncryptionService } from 'src/modules/core/encryption/encryption.service'; import { KeytarEncryptionStrategy } from 'src/modules/core/encryption/strategies/keytar-encryption.strategy'; -import { PlainEncryptionStrategy } from 'src/modules/core/encryption/strategies/plain-encryption.strategy'; import { CaCertBusinessService } from './services/certificates/ca-cert-business/ca-cert-business.service'; import { ClientCertBusinessService } from './services/certificates/client-cert-business/client-cert-business.service'; import { RedisService } from './services/redis/redis.service'; diff --git a/redisinsight/api/src/modules/core/services/redis/redis.service.spec.ts b/redisinsight/api/src/modules/core/services/redis/redis.service.spec.ts index fbd511ca8b..261e9b1ee5 100644 --- a/redisinsight/api/src/modules/core/services/redis/redis.service.spec.ts +++ b/redisinsight/api/src/modules/core/services/redis/redis.service.spec.ts @@ -317,44 +317,31 @@ describe('RedisService', () => { service.getTLSConfig = jest.fn().mockResolvedValue(mockTlsConfigResult); const dto = convertEntityToDto(mockStandaloneDatabaseEntity); const { - host, - port, - password, - username, + host, port, password, username, db, } = dto; - const mockResult = { - host, - port, - username, - password, - tls: mockTlsConfigResult, + const expectedResult = { + host, port, username, password, db, tls: mockTlsConfigResult, }; const result = await service.getRedisConnectionConfig(dto); - expect(JSON.stringify(result)).toEqual(JSON.stringify(mockResult)); + expect(JSON.stringify(result)).toEqual(JSON.stringify(expectedResult)); }); it('should return without tls', async () => { const dto = convertEntityToDto(mockStandaloneDatabaseEntity); delete dto.tls; const { - host, - port, - password, - username, + host, port, password, username, db, } = dto; - const mockResult = { - host, - port, - username, - password, + const expectedResult = { + host, port, username, password, db, }; const result = await service.getRedisConnectionConfig(dto); - expect(result).toEqual(mockResult); + expect(result).toEqual(expectedResult); }); }); diff --git a/redisinsight/api/src/modules/core/services/redis/redis.service.ts b/redisinsight/api/src/modules/core/services/redis/redis.service.ts index fece263571..56f1c93373 100644 --- a/redisinsight/api/src/modules/core/services/redis/redis.service.ts +++ b/redisinsight/api/src/modules/core/services/redis/redis.service.ts @@ -1,16 +1,11 @@ import { Injectable, Logger } from '@nestjs/common'; import { ConnectionOptions, SecureContextOptions } from 'tls'; import * as Redis from 'ioredis'; -import { isEmpty } from 'lodash'; import IORedis, { RedisOptions } from 'ioredis'; -import { v4 as uuidv4 } from 'uuid'; import { - find, - findIndex, - isNil, - omitBy, - remove, + find, findIndex, isEmpty, isNil, omitBy, remove, } from 'lodash'; +import { v4 as uuidv4 } from 'uuid'; import { AppTool } from 'src/models'; import apiConfig from 'src/utils/config'; import { CONNECTION_NAME_GLOBAL_PREFIX } from 'src/constants'; @@ -69,11 +64,6 @@ export class RedisService { ): Promise { const config = await this.getRedisConnectionConfig(options); - // Connect to particular logical database for browser clients only - if ([AppTool.Browser, AppTool.Common].includes(appTool)) { - config.db = options.db; - } - return new Promise((resolve, reject) => { try { const client = new Redis({ @@ -141,22 +131,18 @@ export class RedisService { connectionName: string = CONNECTION_NAME_GLOBAL_PREFIX, ): Promise { const { - username, password, sentinelMaster, tls, + username, password, sentinelMaster, tls, db, } = options; const config: RedisOptions = { sentinels, name: sentinelMaster.name, sentinelUsername: username, sentinelPassword: password, + db, username: sentinelMaster?.username, password: sentinelMaster?.password, }; - // Connect to particular logical database for browser clients only - if ([AppTool.Browser, AppTool.Common].includes(appTool)) { - config.db = options.db; - } - if (tls) { const tlsConfig = await this.getTLSConfig(tls); config.tls = tlsConfig; @@ -293,10 +279,10 @@ export class RedisService { options: ConnectionOptionsDto, ): Promise { const { - host, port, password, username, tls, + host, port, password, username, tls, db, } = options; const config: IORedis.RedisOptions = { - host, port, username, password, + host, port, username, password, db, }; if (tls) { config.tls = await this.getTLSConfig(tls); diff --git a/redisinsight/api/src/modules/enablement-area/enablement-area.module.ts b/redisinsight/api/src/modules/enablement-area/enablement-area.module.ts new file mode 100644 index 0000000000..6c5e1e540b --- /dev/null +++ b/redisinsight/api/src/modules/enablement-area/enablement-area.module.ts @@ -0,0 +1,22 @@ +import { join } from 'path'; +import { Module } from '@nestjs/common'; +import { EnablementAreaProvider } from 'src/modules/enablement-area/enablement-area.provider'; +import { ServeStaticModule } from '@nestjs/serve-static'; +import config from 'src/utils/config'; + +const SERVER_CONFIG = config.get('server'); +const PATH_CONFIG = config.get('dir_path'); + +@Module({ + imports: [ + ServeStaticModule.forRoot({ + serveRoot: SERVER_CONFIG.enablementAreaUri, + rootPath: join(PATH_CONFIG.enablementArea), + serveStaticOptions: { + fallthrough: false, + }, + }), + ], + providers: [EnablementAreaProvider], +}) +export class EnablementAreaModule {} diff --git a/redisinsight/api/src/modules/enablement-area/enablement-area.provider.spec.ts b/redisinsight/api/src/modules/enablement-area/enablement-area.provider.spec.ts new file mode 100644 index 0000000000..188639f87f --- /dev/null +++ b/redisinsight/api/src/modules/enablement-area/enablement-area.provider.spec.ts @@ -0,0 +1,198 @@ +import axios from 'axios'; +import * as fs from 'fs-extra'; +import { Test, TestingModule } from '@nestjs/testing'; +import { EnablementAreaProvider } from 'src/modules/enablement-area/enablement-area.provider'; + +jest.mock('axios'); +const mockedAxios = axios as jest.Mocked; + +jest.mock('fs-extra'); +const mockedFs = fs as jest.Mocked; + +const mockedAdmZip = { + extractAllTo: jest.fn(), +}; +jest.mock('adm-zip', () => jest.fn().mockImplementation(() => mockedAdmZip)); + +describe('EnablementAreaProvider', () => { + let service: EnablementAreaProvider; + + beforeEach(async () => { + jest.mock('fs-extra', () => mockedFs); + jest.mock('axios', () => mockedAxios); + jest.mock('adm-zip', () => jest.fn().mockImplementation(() => mockedAdmZip)); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + EnablementAreaProvider, + ], + }).compile(); + + service = module.get(EnablementAreaProvider); + }); + + describe('onModuleInit', () => { + it('should not copy defaults when files already exists', async () => { + const initDefaultsSpy = jest.spyOn(service, 'initDefaults'); + initDefaultsSpy.mockResolvedValueOnce(); + const autoUpdateSpy = jest.spyOn(service, 'autoUpdate'); + autoUpdateSpy.mockResolvedValueOnce(); + + await service.onModuleInit(); + + expect(initDefaultsSpy).toHaveBeenCalled(); + expect(autoUpdateSpy).toHaveBeenCalled(); + }); + }); + + describe('initDefaults', () => { + it('should not copy defaults when files already exists', async () => { + mockedFs.pathExists.mockImplementationOnce(async () => true); + + await service.initDefaults(); + + expect(mockedFs.ensureDir).not.toHaveBeenCalled(); + expect(mockedFs.copy).not.toHaveBeenCalled(); + }); + it('should copy defaults when no files in home directory', async () => { + mockedFs.pathExists.mockImplementationOnce(async () => false); + + await service.initDefaults(); + + expect(mockedFs.ensureDir).toHaveBeenCalled(); + expect(mockedFs.copy).toHaveBeenCalled(); + }); + it('should not fail when there is an error during copying default files', async () => { + mockedFs.pathExists.mockImplementationOnce(async () => false); + mockedFs.copy.mockImplementationOnce(async () => { throw new Error(); }); + + await service.initDefaults(); + }); + }); + + describe('autoUpdate', () => { + it('should not try to update when there is nothing to update', async () => { + const isUpdatesAvailableSpy = jest.spyOn(service, 'isUpdatesAvailable'); + const updateStaticFilesSpy = jest.spyOn(service, 'updateStaticFiles'); + isUpdatesAvailableSpy.mockResolvedValueOnce(false); + + await service.autoUpdate(); + + expect(updateStaticFilesSpy).not.toHaveBeenCalled(); + }); + it('should try to update', async () => { + const isUpdatesAvailableSpy = jest.spyOn(service, 'isUpdatesAvailable'); + const updateStaticFilesSpy = jest.spyOn(service, 'updateStaticFiles'); + isUpdatesAvailableSpy.mockResolvedValueOnce(true); + updateStaticFilesSpy.mockResolvedValueOnce(); + + await service.autoUpdate(); + + expect(updateStaticFilesSpy).toHaveBeenCalled(); + }); + it('should not throw and error when update failed', async () => { + const isUpdatesAvailableSpy = jest.spyOn(service, 'isUpdatesAvailable'); + const updateStaticFilesSpy = jest.spyOn(service, 'updateStaticFiles'); + isUpdatesAvailableSpy.mockResolvedValueOnce(true); + updateStaticFilesSpy.mockRejectedValueOnce(new Error()); + + await service.autoUpdate(); + + expect(updateStaticFilesSpy).toHaveBeenCalled(); + }); + }); + + describe('updateStaticFiles', () => { + it('should not process when no archive found', async () => { + const getLatestArchiveSpy = jest.spyOn(service, 'getLatestArchive'); + getLatestArchiveSpy.mockResolvedValueOnce(null); + + await service.updateStaticFiles(); + + expect(mockedFs.remove).not.toHaveBeenCalled(); + }); + it('should extract all files', async () => { + const getLatestArchiveSpy = jest.spyOn(service, 'getLatestArchive'); + getLatestArchiveSpy.mockResolvedValueOnce(Buffer.from('asdasdsad')); + mockedAdmZip.extractAllTo.mockResolvedValueOnce(true); + mockedFs.writeFile.mockImplementationOnce(async () => true); + + await service.updateStaticFiles(); + }); + }); + + describe('getLatestArchive', () => { + it('should return latest archive buffer', async () => { + const mockedArchiveBuffer = Buffer.alloc(10, 0); + mockedAxios.get.mockResolvedValueOnce({ data: mockedArchiveBuffer }); + + expect(await service.getLatestArchive()).toEqual(mockedArchiveBuffer); + }); + it('should return null when error during downloading archive', async () => { + mockedAxios.get.mockRejectedValueOnce(new Error()); + + expect(await service.getLatestArchive()).toEqual(null); + }); + }); + + describe('isUpdatesAvailable', () => { + let getCurrentBuildInfoSpy; + let getRemoteBuildInfoSpy; + + beforeEach(() => { + getCurrentBuildInfoSpy = jest.spyOn(service, 'getCurrentBuildInfo'); + getRemoteBuildInfoSpy = jest.spyOn(service, 'getRemoteBuildInfo'); + }); + + it('should return true when current timestamp is less then remote', async () => { + getCurrentBuildInfoSpy.mockResolvedValueOnce({ timestamp: 1 }); + getRemoteBuildInfoSpy.mockResolvedValueOnce({ timestamp: 2 }); + expect(await service.isUpdatesAvailable()).toEqual(true); + }); + it('should return true when no current timestamp but remote timestamp exists', async () => { + getCurrentBuildInfoSpy.mockResolvedValueOnce({}); + getRemoteBuildInfoSpy.mockResolvedValueOnce({ timestamp: 2 }); + expect(await service.isUpdatesAvailable()).toEqual(true); + }); + it('should return false when no remote timestamp but has current', async () => { + getCurrentBuildInfoSpy.mockResolvedValueOnce({ timestamp: 2 }); + getRemoteBuildInfoSpy.mockResolvedValueOnce({}); + expect(await service.isUpdatesAvailable()).toEqual(false); + }); + it('should return false when no remote and current timestamps', async () => { + getCurrentBuildInfoSpy.mockResolvedValueOnce({}); + getRemoteBuildInfoSpy.mockResolvedValueOnce({}); + expect(await service.isUpdatesAvailable()).toEqual(false); + }); + it('should return false when remote is less then current', async () => { + getCurrentBuildInfoSpy.mockResolvedValueOnce({ timestamp: 2 }); + getRemoteBuildInfoSpy.mockResolvedValueOnce({ timestamp: 1 }); + expect(await service.isUpdatesAvailable()).toEqual(false); + }); + }); + + describe('getRemoteBuildInfo', () => { + it('should return remote build info json', async () => { + const mockRemoteBuildInfo = { timestamp: 1 }; + mockedAxios.get.mockResolvedValueOnce({ data: mockRemoteBuildInfo }); + expect(await service.getRemoteBuildInfo()).toEqual(mockRemoteBuildInfo); + }); + it('should return empty object on fail', async () => { + mockedAxios.get.mockRejectedValueOnce(new Error()); + expect(await service.getRemoteBuildInfo()).toEqual({}); + }); + }); + + describe('getCurrentBuildInfo', () => { + it('should return current build info json', async () => { + const mockCurrentBuildInfo = { timestamp: 3 }; + mockedFs.readFile.mockImplementationOnce(async () => Buffer.from(JSON.stringify(mockCurrentBuildInfo))); + expect(await service.getCurrentBuildInfo()).toEqual(mockCurrentBuildInfo); + }); + it('should return empty object on fail', async () => { + mockedFs.readFile.mockImplementationOnce(async () => { throw new Error(); }); + + expect(await service.getCurrentBuildInfo()).toEqual({}); + }); + }); +}); diff --git a/redisinsight/api/src/modules/enablement-area/enablement-area.provider.ts b/redisinsight/api/src/modules/enablement-area/enablement-area.provider.ts new file mode 100644 index 0000000000..47e78d85d9 --- /dev/null +++ b/redisinsight/api/src/modules/enablement-area/enablement-area.provider.ts @@ -0,0 +1,137 @@ +import axios from 'axios'; +import * as fs from 'fs-extra'; +import * as AdmZip from 'adm-zip'; +import { URL } from 'url'; +import { join } from 'path'; +import { Injectable, Logger, OnModuleInit } from '@nestjs/common'; +import config from 'src/utils/config'; +import { get } from 'lodash'; + +const ENABLEMENT_AREA_CONFIG = config.get('enablementArea'); +const PATH_CONFIG = config.get('dir_path'); + +@Injectable() +export class EnablementAreaProvider implements OnModuleInit { + private readonly logger = new Logger('EnablementAreaProvider'); + + /** + * Updates latest json on startup + */ + onModuleInit() { + // async operation to not wait for it and not block user in case when no internet connection + Promise.all([ + this.initDefaults(), + this.autoUpdate(), + ]); + } + + /** + * Simply copy default files prepared during build to the home directory when no files there + */ + async initDefaults() { + try { + if (!await fs.pathExists( + join(PATH_CONFIG.enablementArea, ENABLEMENT_AREA_CONFIG.buildInfo), + )) { + await fs.ensureDir(PATH_CONFIG.enablementArea); + await fs.copy(PATH_CONFIG.defaultEnablementArea, PATH_CONFIG.enablementArea, { + overwrite: true, + }); + } + } catch (e) { + this.logger.error('Unable to create enablement area files from default', e); + } + } + + /** + * Update enablement area if needed + */ + async autoUpdate() { + this.logger.log('Checking for updates...'); + if (await this.isUpdatesAvailable()) { + this.logger.log('Updates available! Updating...'); + + try { + await this.updateStaticFiles(); + } catch (e) { + this.logger.error('Unable to update auto enablement area', e); + } + } + } + + async updateStaticFiles(): Promise { + const latestArchive = await this.getLatestArchive(); + + if (latestArchive) { + const zip = new AdmZip(latestArchive); + await fs.remove(PATH_CONFIG.enablementArea); + await zip.extractAllTo(PATH_CONFIG.enablementArea, true); + await fs.writeFile( + join(PATH_CONFIG.enablementArea, ENABLEMENT_AREA_CONFIG.buildInfo), + JSON.stringify(await this.getRemoteBuildInfo()), + ); + } + } + + /** + * Download archive from remote + */ + async getLatestArchive() { + try { + const { data } = await axios.get( + new URL(join(ENABLEMENT_AREA_CONFIG.updateUrl, ENABLEMENT_AREA_CONFIG.zip)).toString(), + { + responseType: 'arraybuffer', + }, + ); + + return data; + } catch (e) { + this.logger.error('Unable to get remote archive', e); + return null; + } + } + + /** + * Compare current vs remote build timestamp to understand if update is available. + * + * Note: We decided to not use versioning (semver or similar) + */ + async isUpdatesAvailable(): Promise { + const currentBuildInfo = await this.getCurrentBuildInfo(); + const remoteBuildInfo = await this.getRemoteBuildInfo(); + + return get(remoteBuildInfo, ['timestamp'], 0) > get(currentBuildInfo, ['timestamp'], 0); + } + + /** + * Get checksum for the remote latest version + */ + async getRemoteBuildInfo(): Promise> { + try { + const { data } = await axios.get( + new URL(join(ENABLEMENT_AREA_CONFIG.updateUrl, ENABLEMENT_AREA_CONFIG.buildInfo)).toString(), + ); + + return data; + } catch (e) { + this.logger.error('Unable to get remote build info', e); + return {}; + } + } + + /** + * Get checksum for the current version of enablement area + */ + async getCurrentBuildInfo(): Promise> { + try { + return JSON.parse(await fs.readFile( + join(PATH_CONFIG.enablementArea, ENABLEMENT_AREA_CONFIG.buildInfo), + 'utf8', + )); + } catch (e) { + this.logger.error('Unable to get local checksum', e); + return {}; + } + } +} diff --git a/redisinsight/api/src/modules/instances/controllers/instances/instances.controller.ts b/redisinsight/api/src/modules/instances/controllers/instances/instances.controller.ts index c0d7f0b05f..dcf6383108 100644 --- a/redisinsight/api/src/modules/instances/controllers/instances/instances.controller.ts +++ b/redisinsight/api/src/modules/instances/controllers/instances/instances.controller.ts @@ -240,25 +240,6 @@ export class InstancesController { return this.instancesBusinessService.getOverview(id); } - @Get(':id/plugin-commands') - @UseInterceptors(new TimeoutInterceptor()) - @ApiEndpoint({ - description: 'Get Redis Commands available for plugins', - statusCode: 200, - responses: [ - { - status: 200, - description: 'List of available commands', - type: [String], - }, - ], - }) - async getPluginCommands( - @Param('id') id: string, - ): Promise { - return this.instancesBusinessService.getPluginCommands(id); - } - @Post('redis-enterprise-dbs') @ApiEndpoint({ description: 'Add databases from Redis Enterprise cluster', diff --git a/redisinsight/api/src/modules/instances/dto/database-overview.dto.ts b/redisinsight/api/src/modules/instances/dto/database-overview.dto.ts index c74ec6645d..df938528bf 100644 --- a/redisinsight/api/src/modules/instances/dto/database-overview.dto.ts +++ b/redisinsight/api/src/modules/instances/dto/database-overview.dto.ts @@ -1,4 +1,4 @@ -import { ApiProperty } from '@nestjs/swagger'; +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; export class DatabaseOverview { @ApiProperty({ @@ -7,45 +7,45 @@ export class DatabaseOverview { }) version: string; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Total number of bytes allocated by Redis primary shards', type: Number, }) - usedMemory: number; + usedMemory?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Total number of keys inside Redis primary shards', type: Number, }) - totalKeys: number; + totalKeys?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Median for connected clients in the all shards', type: Number, }) - connectedClients: number; + connectedClients?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Sum of current commands per second in the all shards', type: Number, }) - opsPerSecond: number; + opsPerSecond?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Sum of current network input in the all shards (kbps)', type: Number, }) - networkInKbps: number; + networkInKbps?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Sum of current network out in the all shards (kbps)', type: Number, }) - networkOutKbps: number; + networkOutKbps?: number; - @ApiProperty({ + @ApiPropertyOptional({ description: 'Sum of current cpu usage in the all shards (%)', type: Number, }) - cpuUsagePercentage: number; + cpuUsagePercentage?: number; } diff --git a/redisinsight/api/src/modules/monitor/constants/events.ts b/redisinsight/api/src/modules/monitor/constants/events.ts new file mode 100644 index 0000000000..cd6dc6984b --- /dev/null +++ b/redisinsight/api/src/modules/monitor/constants/events.ts @@ -0,0 +1,8 @@ +export enum MonitorGatewayClientEvents { + Monitor = 'monitor', +} + +export enum MonitorGatewayServerEvents { + Data = 'monitorData', + Exception = 'exception', +} diff --git a/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.interface.ts b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.interface.ts new file mode 100644 index 0000000000..a09b5159f7 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.interface.ts @@ -0,0 +1,15 @@ +import IORedis from 'ioredis'; + +export interface IOnDatePayload { + time: string; + args: string[]; + source: string; + database: number; + shardOptions: IORedis.RedisOptions +} + +export interface IClientMonitorObserver { + id: string; + handleOnData: (data: IOnDatePayload) => void; + handleOnDisconnect: () => void; +} diff --git a/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.spec.ts b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.spec.ts new file mode 100644 index 0000000000..7f495e207d --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.spec.ts @@ -0,0 +1,49 @@ +import { WsException } from '@nestjs/websockets'; +import * as MockedSocket from 'socket.io-mock'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { MonitorGatewayServerEvents } from 'src/modules/monitor/constants/events'; +import ClientMonitorObserver from './client-monitor-observer'; +import { IOnDatePayload } from './client-monitor-observer.interface'; + +describe('ClientMonitorObserver', () => { + let socketClient; + + beforeEach(() => { + socketClient = new MockedSocket(); + socketClient.id = '123'; + socketClient.emit = jest.fn(); + }); + + it.only('should be defined', () => { + const client = new ClientMonitorObserver(socketClient.id, socketClient); + + expect(client.id).toEqual(socketClient.id); + }); + it.only('should emit event on monitorData', async () => { + const client = new ClientMonitorObserver(socketClient.id, socketClient); + const monitorData = { + // unix timestamp + time: `${(new Date()).getTime() / 1000}`, + source: '127.0.0.1:58612', + database: 0, + args: ['set', 'foo', 'bar'], + }; + const payload: IOnDatePayload = { ...monitorData, shardOptions: { host: '127.0.0.1', port: 6379 } }; + + client.handleOnData(payload); + + await new Promise((r) => setTimeout(r, 500)); + + expect(socketClient.emit).toHaveBeenCalledWith(MonitorGatewayServerEvents.Data, [monitorData]); + }); + it.only('should emit exception event', () => { + const client = new ClientMonitorObserver(socketClient.id, socketClient); + + client.handleOnDisconnect(); + + expect(socketClient.emit).toHaveBeenCalledWith( + MonitorGatewayServerEvents.Exception, + new WsException(ERROR_MESSAGES.NO_CONNECTION_TO_REDIS_DB), + ); + }); +}); diff --git a/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.ts b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.ts new file mode 100644 index 0000000000..ee1757faac --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/client-monitor-observer.ts @@ -0,0 +1,52 @@ +import { Socket } from 'socket.io'; +import { MonitorGatewayServerEvents } from 'src/modules/monitor/constants/events'; +import { WsException } from '@nestjs/websockets'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { debounce } from 'lodash'; +import { IClientMonitorObserver, IOnDatePayload } from './client-monitor-observer.interface'; + +class ClientMonitorObserver implements IClientMonitorObserver { + public readonly id: string; + + private readonly client: Socket; + + private filters: any[]; + + private readonly debounce: any; + + private items: any[]; + + constructor(id: string, client: Socket) { + this.id = id; + this.client = client; + this.items = []; + this.debounce = debounce(() => { + if (this.items.length) { + this.client.emit(MonitorGatewayServerEvents.Data, this.items); + this.items = []; + } + }, 10, { + maxWait: 50, + }); + } + + public handleOnData(payload: IOnDatePayload) { + const { + time, args, source, database, + } = payload; + + this.items.push({ + time, args, source, database, + }); + + this.debounce(); + } + + public handleOnDisconnect() { + this.client.emit( + MonitorGatewayServerEvents.Exception, + new WsException(ERROR_MESSAGES.NO_CONNECTION_TO_REDIS_DB), + ); + } +} +export default ClientMonitorObserver; diff --git a/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/index.ts b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/index.ts new file mode 100644 index 0000000000..0605f6419d --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/client-monitor-observer/index.ts @@ -0,0 +1,2 @@ +export * from './client-monitor-observer' +export * from './client-monitor-observer.interface' diff --git a/redisinsight/api/src/modules/monitor/helpers/monitor-observer/index.ts b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/index.ts new file mode 100644 index 0000000000..6ef9a6501d --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/index.ts @@ -0,0 +1,3 @@ +export * from './monitor-observer.interface'; +export * from './monitor-observer'; +export * from './shard-obsever.interface'; diff --git a/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.interface.ts b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.interface.ts new file mode 100644 index 0000000000..6c331c00e9 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.interface.ts @@ -0,0 +1,16 @@ +import { IClientMonitorObserver } from '../client-monitor-observer'; + +export enum MonitorObserverStatus { + Wait = 'wait', + Ready = 'ready', + End = 'end', + Error = 'error', +} + +export interface IMonitorObserver { + status: MonitorObserverStatus; + subscribe: (client: IClientMonitorObserver) => Promise; + unsubscribe: (id: string) => void; + getSize: () => number; + clear: () => void; +} diff --git a/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.spec.ts b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.spec.ts new file mode 100644 index 0000000000..8ac7813859 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.spec.ts @@ -0,0 +1,89 @@ +import * as Redis from 'ioredis'; +import { mockClientMonitorObserver, mockRedisMonitorObserver } from 'src/__mocks__/monitor'; +import { MonitorObserverStatus } from './monitor-observer.interface'; +import { MonitorObserver } from './monitor-observer'; + +const nodeClient = Object.create(Redis.prototype); +nodeClient.monitor = jest.fn().mockResolvedValue(mockRedisMonitorObserver); +nodeClient.status = 'ready'; +nodeClient.options = { ...nodeClient.options, host: 'localhost', port: 6379 }; + +const clusterClient = Object.create(Redis.Cluster.prototype); +const mockClusterNode1 = nodeClient; +const mockClusterNode2 = nodeClient; +mockClusterNode1.options = { ...nodeClient.options, host: 'localhost', port: 5000 }; +mockClusterNode2.options = { ...nodeClient.options, host: 'localhost', port: 5001 }; + +clusterClient.nodes = jest.fn().mockReturnValue([mockClusterNode1, mockClusterNode2]); + +describe('MonitorObserver', () => { + describe('for redis standalone', () => { + let monitorObserver; + beforeEach(() => { + monitorObserver = new MonitorObserver(nodeClient); + }); + + it('should create shard observer only on first subscribe call', async () => { + const connectMethod = jest.spyOn(monitorObserver, 'connect'); + + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '1' }); + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '2' }); + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '2' }); + + expect(monitorObserver.status).toBe(MonitorObserverStatus.Ready); + expect(connectMethod).toHaveBeenCalledTimes(1); + expect(monitorObserver.clientMonitorObservers.has('1')).toEqual(true); + expect(monitorObserver.clientMonitorObservers.has('2')).toEqual(true); + expect(monitorObserver.shardsObservers.length).toEqual(1); + expect(monitorObserver.getSize()).toEqual(2); + }); + it('should be set to END status on clear', async () => { + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '1' }); + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '2' }); + + monitorObserver.clear(); + + expect(monitorObserver.status).toBe(MonitorObserverStatus.End); + expect(monitorObserver.getSize()).toEqual(0); + expect(monitorObserver.shardsObservers.length).toEqual(0); + }); + it('should be set to END status if there are no more observers', async () => { + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '1' }); + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '2' }); + + monitorObserver.unsubscribe('1'); + monitorObserver.unsubscribe('2'); + + expect(monitorObserver.status).toBe(MonitorObserverStatus.End); + expect(monitorObserver.getSize()).toEqual(0); + expect(monitorObserver.shardsObservers.length).toEqual(0); + }); + }); + describe('for redis cluster', () => { + let monitorObserver; + beforeEach(() => { + monitorObserver = new MonitorObserver(clusterClient); + }); + + it('should create shard observer only on first subscribe call', async () => { + const connectMethod = jest.spyOn(monitorObserver, 'connect'); + + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '1' }); + + expect(monitorObserver.status).toBe(MonitorObserverStatus.Ready); + expect(connectMethod).toHaveBeenCalledTimes(1); + expect(monitorObserver.clientMonitorObservers.has('1')).toEqual(true); + expect(monitorObserver.shardsObservers.length).toEqual(2); + expect(monitorObserver.getSize()).toEqual(1); + }); + it('should be set to END status on clear', async () => { + await monitorObserver.subscribe({ ...mockClientMonitorObserver, id: '1' }); + + monitorObserver.clear(); + + expect(monitorObserver.status).toBe(MonitorObserverStatus.End); + expect(monitorObserver.getSize()).toEqual(0); + expect(monitorObserver.shardsObservers.length).toEqual(0); + }); + }); +}); diff --git a/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.ts b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.ts new file mode 100644 index 0000000000..7bc7937e69 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/monitor-observer.ts @@ -0,0 +1,81 @@ +import { ServiceUnavailableException } from '@nestjs/common'; +import IORedis from 'ioredis'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { IMonitorObserver, MonitorObserverStatus } from './monitor-observer.interface'; +import { IShardObserver } from './shard-obsever.interface'; +import { IClientMonitorObserver } from '../client-monitor-observer'; + +export class MonitorObserver implements IMonitorObserver { + private readonly redis: IORedis.Redis | IORedis.Cluster; + + private clientMonitorObservers: Map = new Map(); + + private shardsObservers: IShardObserver[] = []; + + public status: MonitorObserverStatus; + + constructor(redis: IORedis.Redis | IORedis.Cluster) { + this.redis = redis; + this.status = MonitorObserverStatus.Wait; + } + + public async subscribe(client: IClientMonitorObserver) { + if (this.status !== MonitorObserverStatus.Ready) { + await this.connect(); + } + if (this.clientMonitorObservers.has(client.id)) { + return; + } + + this.shardsObservers.forEach((observer) => { + observer.on('monitor', (time, args, source, database) => { + client.handleOnData({ + time, args, database, source, shardOptions: observer.options, + }); + }); + observer.on('end', () => { + client.handleOnDisconnect(); + this.clear(); + }); + }); + this.clientMonitorObservers.set(client.id, client); + } + + public unsubscribe(id: string) { + this.clientMonitorObservers.delete(id); + if (this.clientMonitorObservers.size === 0) { + this.clear(); + } + } + + public clear() { + this.clientMonitorObservers.clear(); + this.shardsObservers.forEach((observer) => observer.disconnect()); + this.shardsObservers = []; + this.status = MonitorObserverStatus.End; + } + + public getSize(): number { + return this.clientMonitorObservers.size; + } + + private async connect(): Promise { + try { + if (this.redis instanceof IORedis.Cluster) { + this.shardsObservers = await Promise.all( + this.redis.nodes('all').filter((node) => node.status === 'ready').map(this.createShardObserver), + ); + } else { + this.shardsObservers = [await this.createShardObserver(this.redis)]; + } + this.status = MonitorObserverStatus.Ready; + } catch (error) { + this.status = MonitorObserverStatus.Error; + throw new ServiceUnavailableException(ERROR_MESSAGES.NO_CONNECTION_TO_REDIS_DB); + } + } + + private async createShardObserver(redis: IORedis.Redis): Promise { + return await redis.monitor() as IShardObserver; + } +} diff --git a/redisinsight/api/src/modules/monitor/helpers/monitor-observer/shard-obsever.interface.ts b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/shard-obsever.interface.ts new file mode 100644 index 0000000000..8a2d626dd9 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/helpers/monitor-observer/shard-obsever.interface.ts @@ -0,0 +1,7 @@ +import { EventEmitter } from 'events'; +import IORedis from 'ioredis'; + +export interface IShardObserver extends EventEmitter { + disconnect(): void; + options?: IORedis.RedisOptions, +} diff --git a/redisinsight/api/src/modules/monitor/monitor.gateway.ts b/redisinsight/api/src/modules/monitor/monitor.gateway.ts new file mode 100644 index 0000000000..47d17046ab --- /dev/null +++ b/redisinsight/api/src/modules/monitor/monitor.gateway.ts @@ -0,0 +1,57 @@ +import { Logger } from '@nestjs/common'; +import { + OnGatewayConnection, + OnGatewayDisconnect, + OnGatewayInit, + SubscribeMessage, + WebSocketGateway, + WebSocketServer, + WsException, +} from '@nestjs/websockets'; +import { Socket, Server } from 'socket.io'; +import { get } from 'lodash'; +import config from 'src/utils/config'; +import { MonitorService } from './monitor.service'; +import { MonitorGatewayClientEvents } from './constants/events'; +import ClientMonitorObserver from './helpers/client-monitor-observer/client-monitor-observer'; + +const SOCKETS_CONFIG = config.get('sockets'); + +@WebSocketGateway({ namespace: 'monitor', cors: SOCKETS_CONFIG.cors, serveClient: SOCKETS_CONFIG.serveClient }) +export class MonitorGateway implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect { + @WebSocketServer() wss: Server; + + private logger: Logger = new Logger('MonitorGateway'); + + constructor(private service: MonitorService) {} + + afterInit(): void { + this.logger.log('Initialized'); + } + + async handleConnection(socketClient: Socket): Promise { + // eslint-disable-next-line sonarjs/no-duplicate-string + const instanceId = get(socketClient, 'handshake.query.instanceId'); + this.logger.log(`Client connected: ${socketClient.id}, instanceId: ${instanceId}`); + } + + @SubscribeMessage(MonitorGatewayClientEvents.Monitor) + async monitor(socketClient: Socket): Promise { + try { + const instanceId = get(socketClient, 'handshake.query.instanceId'); + await this.service.addListenerForInstance( + instanceId, + new ClientMonitorObserver(socketClient.id, socketClient), + ); + return { status: 'ok' }; + } catch (error) { + throw new WsException(error); + } + } + + handleDisconnect(socketClient: Socket): void { + const instanceId = get(socketClient, 'handshake.query.instanceId'); + this.logger.log(`Client disconnected: ${socketClient.id}, instanceId: ${instanceId}`); + this.service.removeListenerFromInstance(instanceId, socketClient.id); + } +} diff --git a/redisinsight/api/src/modules/monitor/monitor.module.ts b/redisinsight/api/src/modules/monitor/monitor.module.ts new file mode 100644 index 0000000000..56e3e6d8a3 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/monitor.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { SharedModule } from 'src/modules/shared/shared.module'; +import { MonitorGateway } from './monitor.gateway'; +import { MonitorService } from './monitor.service'; + +@Module({ + imports: [SharedModule], + providers: [MonitorGateway, MonitorService], +}) +export class MonitorModule {} diff --git a/redisinsight/api/src/modules/monitor/monitor.service.spec.ts b/redisinsight/api/src/modules/monitor/monitor.service.spec.ts new file mode 100644 index 0000000000..53027278b5 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/monitor.service.spec.ts @@ -0,0 +1,160 @@ +import { ServiceUnavailableException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { v4 as uuidv4 } from 'uuid'; +import { mockClientMonitorObserver, mockMonitorObserver } from 'src/__mocks__/monitor'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { RedisService } from 'src/modules/core/services/redis/redis.service'; +import { mockRedisClientInstance } from 'src/modules/shared/services/base/redis-consumer.abstract.service.spec'; +import { InstancesBusinessService } from 'src/modules/shared/services/instances-business/instances-business.service'; +import { MonitorService } from './monitor.service'; +import { MonitorObserver } from './helpers/monitor-observer'; + +jest.mock('./helpers/monitor-observer'); + +describe('MonitorService', () => { + let service; + let redisService; + let instancesBusinessService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + MonitorService, + { + provide: RedisService, + useFactory: () => ({ + getClientInstance: jest.fn(), + isClientConnected: jest.fn(), + }), + }, + { + provide: InstancesBusinessService, + useFactory: () => ({ + connectToInstance: jest.fn(), + }), + }, + ], + }).compile(); + + service = module.get(MonitorService); + redisService = await module.get(RedisService); + instancesBusinessService = await module.get(InstancesBusinessService); + }); + + describe('addListenerForInstance', () => { + let getRedisClientForInstance; + beforeEach(() => { + getRedisClientForInstance = jest.spyOn(service, 'getRedisClientForInstance'); + service.monitorObservers = {}; + }); + + it('should use exist redis client and create new monitor observer', async () => { + const { instanceId } = mockRedisClientInstance; + redisService.getClientInstance.mockReturnValue(mockRedisClientInstance); + redisService.isClientConnected.mockReturnValue(true); + + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + + expect(getRedisClientForInstance).toHaveBeenCalledWith(instanceId); + expect(MonitorObserver).toHaveBeenCalled(); + expect(service.monitorObservers[instanceId]).toBeDefined(); + }); + it('should use exist monitor observer for instance', async () => { + const { instanceId } = mockRedisClientInstance; + service.monitorObservers = { [instanceId]: { ...mockMonitorObserver, status: 'ready' } }; + + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + + expect(getRedisClientForInstance).not.toHaveBeenCalled(); + expect(Object.keys(service.monitorObservers).length).toEqual(1); + }); + it('should recreate exist monitor observer', async () => { + const { instanceId } = mockRedisClientInstance; + service.monitorObservers = { [instanceId]: { ...mockMonitorObserver, status: 'end' } }; + redisService.getClientInstance.mockReturnValue(mockRedisClientInstance); + redisService.isClientConnected.mockReturnValue(true); + + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + + expect(MonitorObserver).toHaveBeenCalled(); + expect(getRedisClientForInstance).toHaveBeenCalled(); + expect(Object.keys(service.monitorObservers).length).toEqual(1); + }); + it('should recreate redis client', async () => { + const { instanceId } = mockRedisClientInstance; + redisService.getClientInstance.mockReturnValue(mockRedisClientInstance); + redisService.isClientConnected.mockReturnValue(false); + instancesBusinessService.connectToInstance.mockResolvedValue(mockRedisClientInstance); + + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + + expect(instancesBusinessService.connectToInstance).toHaveBeenCalled(); + }); + it('should throw timeout exception on create redis client', async () => { + const { instanceId } = mockRedisClientInstance; + redisService.getClientInstance.mockReturnValue(null); + instancesBusinessService.connectToInstance = jest.fn() + .mockReturnValue(new Promise(() => {})); + + try { + await service.addListenerForInstance(instanceId, mockClientMonitorObserver); + } catch (error) { + expect(error).toEqual(new ServiceUnavailableException(ERROR_MESSAGES.NO_CONNECTION_TO_REDIS_DB)); + } + }); + }); + describe('removeListenerFromInstance', () => { + beforeEach(() => { + service.monitorObservers = {}; + }); + + it('should unsubscribe listeners from monitor observer', async () => { + const { instanceId } = mockRedisClientInstance; + const listenerId = uuidv4(); + const monitorObserver = { ...mockMonitorObserver, status: 'ready', unsubscribe: jest.fn() }; + service.monitorObservers = { [instanceId]: monitorObserver }; + + service.removeListenerFromInstance(instanceId, listenerId); + + expect(monitorObserver.unsubscribe).toHaveBeenCalledWith(listenerId); + }); + it('should be ignored if monitor observer does not exist for instance', () => { + const { instanceId } = mockRedisClientInstance; + const listenerId = uuidv4(); + const monitorObserver = { ...mockMonitorObserver, status: 'ready', unsubscribe: jest.fn() }; + service.monitorObservers = { [instanceId]: monitorObserver }; + + service.removeListenerFromInstance(uuidv4(), listenerId); + + expect(monitorObserver.unsubscribe).not.toHaveBeenCalled(); + }); + }); + + describe('handleInstanceDeletedEvent', () => { + beforeEach(() => { + service.monitorObservers = {}; + }); + + it('should clear exist monitor observer fro instance', () => { + const { instanceId } = mockRedisClientInstance; + const monitorObserver = { ...mockMonitorObserver, status: 'ready', clear: jest.fn() }; + service.monitorObservers = { [instanceId]: monitorObserver }; + + service.handleInstanceDeletedEvent(instanceId); + + expect(monitorObserver.clear).toHaveBeenCalled(); + expect(service.monitorObservers[instanceId]).not.toBeDefined(); + }); + it('should be ignored if monitor observer does not exist for instance', () => { + const { instanceId } = mockRedisClientInstance; + const monitorObserver = { ...mockMonitorObserver, status: 'ready', clear: jest.fn() }; + service.monitorObservers = { [instanceId]: monitorObserver }; + + service.handleInstanceDeletedEvent(uuidv4()); + + expect(monitorObserver.clear).not.toHaveBeenCalled(); + expect(service.monitorObservers[instanceId]).toBeDefined(); + }); + }); +}); diff --git a/redisinsight/api/src/modules/monitor/monitor.service.ts b/redisinsight/api/src/modules/monitor/monitor.service.ts new file mode 100644 index 0000000000..69819a4380 --- /dev/null +++ b/redisinsight/api/src/modules/monitor/monitor.service.ts @@ -0,0 +1,85 @@ +import { Injectable, Logger, ServiceUnavailableException } from '@nestjs/common'; +import { OnEvent } from '@nestjs/event-emitter'; +import IORedis from 'ioredis'; +import { AppTool } from 'src/models'; +import config from 'src/utils/config'; +import { AppRedisInstanceEvents } from 'src/constants'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { withTimeout } from 'src/utils/promise-with-timeout'; +import { RedisService } from 'src/modules/core/services/redis/redis.service'; +import { InstancesBusinessService } from 'src/modules/shared/services/instances-business/instances-business.service'; +import { IMonitorObserver, MonitorObserver, MonitorObserverStatus } from './helpers/monitor-observer'; +import { IClientMonitorObserver } from './helpers/client-monitor-observer/client-monitor-observer.interface'; + +const serverConfig = config.get('server'); + +@Injectable() +export class MonitorService { + private logger = new Logger('MonitorService'); + + private monitorObservers: Record = {}; + + constructor( + private redisService: RedisService, + private instancesBusinessService: InstancesBusinessService, + ) {} + + async addListenerForInstance(instanceId: string, client: IClientMonitorObserver) { + this.logger.log(`Add listener for instance: ${instanceId}.`); + const monitorObserver = await this.getMonitorObserver(instanceId); + await monitorObserver.subscribe(client); + } + + removeListenerFromInstance(instanceId: string, listenerId: string) { + this.logger.log(`Remove listener from instance: ${instanceId}.`); + const observer = this.monitorObservers[instanceId]; + if (observer) { + observer.unsubscribe(listenerId); + } + } + + @OnEvent(AppRedisInstanceEvents.Deleted) + handleInstanceDeletedEvent(instanceId: string) { + this.logger.log(`Handle instance deleted event. instance: ${instanceId}.`); + try { + const monitorObserver = this.monitorObservers[instanceId]; + if (monitorObserver) { + monitorObserver.clear(); + delete this.monitorObservers[instanceId]; + } + } catch (e) { + // continue regardless of error + } + } + + private async getMonitorObserver(instanceId: string): Promise { + this.logger.log('Getting redis monitor observer...'); + try { + if ( + !this.monitorObservers[instanceId] + || this.monitorObservers[instanceId].status !== MonitorObserverStatus.Ready + ) { + const redisClient = await this.getRedisClientForInstance(instanceId); + this.monitorObservers[instanceId] = new MonitorObserver(redisClient); + } + this.logger.log('Succeed to get monitor observer.'); + return this.monitorObservers[instanceId]; + } catch (error) { + this.logger.error(`Failed to get monitor observer. ${error.message}.`, JSON.stringify(error)); + throw error; + } + } + + private async getRedisClientForInstance(instanceId: string): Promise { + const tool = AppTool.Common; + const commonClient = this.redisService.getClientInstance({ instanceId, tool })?.client; + if (commonClient && this.redisService.isClientConnected(commonClient)) { + return commonClient; + } + return withTimeout( + this.instancesBusinessService.connectToInstance(instanceId, tool, true), + serverConfig.requestTimeout, + new ServiceUnavailableException(ERROR_MESSAGES.NO_CONNECTION_TO_REDIS_DB), + ); + } +} diff --git a/redisinsight/api/src/modules/shared/exceptions/client-not-found-error.exception.ts b/redisinsight/api/src/modules/shared/exceptions/client-not-found-error.exception.ts new file mode 100644 index 0000000000..63fbb8f65c --- /dev/null +++ b/redisinsight/api/src/modules/shared/exceptions/client-not-found-error.exception.ts @@ -0,0 +1,11 @@ +import { HttpException } from '@nestjs/common'; + +export class ClientNotFoundErrorException extends HttpException { + constructor(response: string | Record = { + message: 'Client not found or it has been disconnected.', + name: 'ClientNotFoundError', + statusCode: 404, + }, status = 404) { + super(response, status); + } +} diff --git a/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.spec.ts b/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.spec.ts index c76fb431d8..467d1ada75 100644 --- a/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.spec.ts @@ -14,6 +14,8 @@ import { InstancesBusinessService } from 'src/modules/shared/services/instances- import { BrowserToolService } from 'src/modules/browser/services/browser-tool/browser-tool.service'; import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity'; import { CONNECTION_NAME_GLOBAL_PREFIX } from 'src/constants'; +import { RedisConsumerAbstractService } from 'src/modules/shared/services/base/redis-consumer.abstract.service'; +import { ClientNotFoundErrorException } from 'src/modules/shared/exceptions/client-not-found-error.exception'; const mockClientOptions: IFindRedisClientInstanceByOptions = { instanceId: mockStandaloneDatabaseEntity.id, @@ -130,6 +132,18 @@ describe('RedisConsumerAbstractService', () => { }), ).rejects.toThrow(error); }); + it('should throw error if autoConnection disabled', async () => { + redisService.getClientInstance.mockReturnValue(null); + // @ts-ignore + class Tool extends RedisConsumerAbstractService { + constructor() { + super(AppTool.CLI, redisService, instancesBusinessService, { enableAutoConnection: false }); + } + } + + await expect(new Tool().getRedisClient(mockClientOptions)) + .rejects.toThrow(new ClientNotFoundErrorException()); + }); }); describe('createNewClient', () => { diff --git a/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.ts b/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.ts index f82b987795..9233523230 100644 --- a/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.ts +++ b/redisinsight/api/src/modules/shared/services/base/redis-consumer.abstract.service.ts @@ -11,6 +11,8 @@ import { RedisService, } from 'src/modules/core/services/redis/redis.service'; import { InstancesBusinessService } from 'src/modules/shared/services/instances-business/instances-business.service'; +import { ClientNotFoundErrorException } from 'src/modules/shared/exceptions/client-not-found-error.exception'; +import { IRedisToolOptions, DEFAULT_REDIS_TOOL_OPTIONS } from 'src/modules/shared/services/base/redis-tool-options'; export abstract class RedisConsumerAbstractService implements IRedisConsumer { protected redisService: RedisService; @@ -19,12 +21,16 @@ export abstract class RedisConsumerAbstractService implements IRedisConsumer { protected consumer: AppTool; + private readonly options: IRedisToolOptions = DEFAULT_REDIS_TOOL_OPTIONS; + protected constructor( consumer: AppTool, redisService: RedisService, instancesBusinessService: InstancesBusinessService, + options: IRedisToolOptions = {}, ) { this.consumer = consumer; + this.options = { ...this.options, ...options }; this.redisService = redisService; this.instancesBusinessService = instancesBusinessService; } @@ -37,9 +43,7 @@ export abstract class RedisConsumerAbstractService implements IRedisConsumer { abstract execPipeline( clientOptions: IFindRedisClientInstanceByOptions, - toolCommands: Array< - [toolCommand: any, ...args: Array] - >, + toolCommands: Array<[toolCommand: any, ...args: Array]>, ): Promise<[ReplyError | null, any]>; private prepareCommands( @@ -97,20 +101,13 @@ export abstract class RedisConsumerAbstractService implements IRedisConsumer { ...options, tool: this.consumer, }); - if (!redisClientInstance) { - return await this.createNewClient( - options.instanceId, - options.uuid, - ); - } - const isConnected: boolean = this.redisService.isClientConnected( - redisClientInstance.client, - ); - if (!isConnected) { + if (!redisClientInstance || !this.redisService.isClientConnected(redisClientInstance.client)) { this.redisService.removeClientInstance({ - instanceId: redisClientInstance.instanceId, + instanceId: redisClientInstance?.instanceId, tool: this.consumer, }); + if (!this.options.enableAutoConnection) throw new ClientNotFoundErrorException(); + return await this.createNewClient( options.instanceId, options.uuid, diff --git a/redisinsight/api/src/modules/shared/services/base/redis-tool-options.ts b/redisinsight/api/src/modules/shared/services/base/redis-tool-options.ts new file mode 100644 index 0000000000..c6f54c2f5a --- /dev/null +++ b/redisinsight/api/src/modules/shared/services/base/redis-tool-options.ts @@ -0,0 +1,7 @@ +export interface IRedisToolOptions { + enableAutoConnection?: boolean, +} + +export const DEFAULT_REDIS_TOOL_OPTIONS: IRedisToolOptions = { + enableAutoConnection: true, +}; diff --git a/redisinsight/api/src/modules/shared/services/base/redis-tool.factory.ts b/redisinsight/api/src/modules/shared/services/base/redis-tool.factory.ts new file mode 100644 index 0000000000..77c927ca11 --- /dev/null +++ b/redisinsight/api/src/modules/shared/services/base/redis-tool.factory.ts @@ -0,0 +1,18 @@ +import { Injectable } from '@nestjs/common'; +import { AppTool } from 'src/models'; +import { RedisService } from 'src/modules/core/services/redis/redis.service'; +import { InstancesBusinessService } from 'src/modules/shared/services/instances-business/instances-business.service'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; +import { IRedisToolOptions } from 'src/modules/shared/services/base/redis-tool-options'; + +@Injectable() +export class RedisToolFactory { + constructor( + protected redisService: RedisService, + protected instancesBusinessService: InstancesBusinessService, + ) {} + + createRedisTool(appTool: AppTool, options: IRedisToolOptions = {}) { + return new RedisToolService(appTool, this.redisService, this.instancesBusinessService, options); + } +} diff --git a/redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.spec.ts b/redisinsight/api/src/modules/shared/services/base/redis-tool.service.spec.ts similarity index 83% rename from redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.spec.ts rename to redisinsight/api/src/modules/shared/services/base/redis-tool.service.spec.ts index 9c360183fa..c4f9c05c05 100644 --- a/redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/base/redis-tool.service.spec.ts @@ -1,14 +1,11 @@ import { Test, TestingModule } from '@nestjs/testing'; import * as Redis from 'ioredis-mock'; import { mockStandaloneDatabaseEntity } from 'src/__mocks__'; -import { - IFindRedisClientInstanceByOptions, - RedisService, -} from 'src/modules/core/services/redis/redis.service'; +import { IFindRedisClientInstanceByOptions, RedisService } from 'src/modules/core/services/redis/redis.service'; import { InstancesBusinessService } from 'src/modules/shared/services/instances-business/instances-business.service'; import { BrowserToolKeysCommands } from 'src/modules/browser/constants/browser-tool-commands'; import { InternalServerErrorException } from '@nestjs/common'; -import { CliToolService } from 'src/modules/cli/services/cli-tool/cli-tool.service'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; const mockClientOptions: IFindRedisClientInstanceByOptions = { instanceId: mockStandaloneDatabaseEntity.id, @@ -17,13 +14,13 @@ const mockClientOptions: IFindRedisClientInstanceByOptions = { const mockClient = new Redis(); describe('CliToolService', () => { - let service: CliToolService; + let service: RedisToolService; let getRedisClient; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ providers: [ - CliToolService, + RedisToolService, { provide: RedisService, useFactory: () => ({}), @@ -35,8 +32,8 @@ describe('CliToolService', () => { ], }).compile(); - service = await module.get(CliToolService); - getRedisClient = jest.spyOn(service, 'getRedisClient'); + service = await module.get(RedisToolService); + getRedisClient = jest.spyOn(service, 'getRedisClient'); mockClient.sendCommand = jest.fn(); }); diff --git a/redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.ts b/redisinsight/api/src/modules/shared/services/base/redis-tool.service.ts similarity index 93% rename from redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.ts rename to redisinsight/api/src/modules/shared/services/base/redis-tool.service.ts index 509c981040..f181b5ba52 100644 --- a/redisinsight/api/src/modules/cli/services/cli-tool/cli-tool.service.ts +++ b/redisinsight/api/src/modules/shared/services/base/redis-tool.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from '@nestjs/common'; +import { Logger } from '@nestjs/common'; import * as Redis from 'ioredis'; import IORedis from 'ioredis'; import { v4 as uuidv4 } from 'uuid'; @@ -19,6 +19,7 @@ import { CommandExecutionStatus, } from 'src/modules/cli/dto/cli.dto'; import { getConnectionName } from 'src/utils/redis-connection-helper'; +import { IRedisToolOptions } from './redis-tool-options'; export interface ICliExecResultFromNode { host: string; @@ -29,15 +30,17 @@ export interface ICliExecResultFromNode { error?: any, } -@Injectable() -export class CliToolService extends RedisConsumerAbstractService { - private logger = new Logger('CliToolService'); +export class RedisToolService extends RedisConsumerAbstractService { + private logger: Logger; constructor( + private appTool: AppTool, protected redisService: RedisService, protected instancesBusinessService: InstancesBusinessService, + options: IRedisToolOptions = {}, ) { - super(AppTool.CLI, redisService, instancesBusinessService); + super(appTool, redisService, instancesBusinessService, options); + this.logger = new Logger(`${appTool}ToolService`); } async execCommand( diff --git a/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.spec.ts b/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.spec.ts index 8f1bb22e50..c41ce9bc88 100644 --- a/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.spec.ts @@ -7,11 +7,9 @@ import { mockRedisClusterFailInfoResponse, mockRedisClusterNodesResponse, mockRedisClusterOkInfoResponse, - mockRedisCommandReply, mockRedisSentinelMasterResponse, mockRedisServerInfoResponse, mockStandaloneRedisInfoReply, - mockWhitelistCommandsResponse, } from 'src/__mocks__'; import { RedisDatabaseInfoResponse } from 'src/modules/instances/dto/redis-info.dto'; import { REDIS_MODULES_COMMANDS, RedisModules } from 'src/constants'; @@ -336,37 +334,4 @@ describe('ConfigurationBusinessService', () => { }); }); }); - - describe('getPluginWhiteListCommands', () => { - beforeEach(() => { - service.getDatabasesCount = jest.fn().mockResolvedValue(16); - }); - it('should return 2 readonly commands', async () => { - mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); - mockClient.send_command.mockResolvedValueOnce([]); - mockClient.send_command.mockResolvedValueOnce([]); - - const result = await service.getPluginWhiteListCommands(mockClient); - - expect(result).toEqual(mockWhitelistCommandsResponse); - }); - it('should return 1 readonly commands excluded by dangerous filter', async () => { - mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); - mockClient.send_command.mockResolvedValueOnce(['custom.command']); - mockClient.send_command.mockResolvedValueOnce([]); - - const result = await service.getPluginWhiteListCommands(mockClient); - - expect(result).toEqual(['get']); - }); - it('should return 1 readonly commands excluded by blocking filter', async () => { - mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); - mockClient.send_command.mockResolvedValueOnce([]); - mockClient.send_command.mockResolvedValueOnce(['custom.command']); - - const result = await service.getPluginWhiteListCommands(mockClient); - - expect(result).toEqual(['get']); - }); - }); }); diff --git a/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.ts b/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.ts index 55a8410b0a..b17a64b166 100644 --- a/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.ts +++ b/redisinsight/api/src/modules/shared/services/configuration-business/configuration-business.service.ts @@ -178,39 +178,4 @@ export class ConfigurationBusinessService { })); return modules; } - - /** - * Get whitelisted commands available for plugins for particular database - */ - async getPluginWhiteListCommands(client: any): Promise { - let pluginWhiteListCommands = []; - try { - const availableCommands = await client.send_command('command'); - const readOnlyCommands = map(filter(availableCommands, ( - command, - ) => get(command, [2], []) - .includes('readonly')), (command) => command[0]); - - const blackListCommands = [...pluginUnsupportedCommands, ...pluginBlockingCommands]; - try { - const dangerousCommands = await client.send_command('acl', ['cat', 'dangerous']); - blackListCommands.push(...dangerousCommands); - } catch (e) { - // ignore error as acl cat available since Redis 6.0 - } - - try { - const blockingCommands = await client.send_command('acl', ['cat', 'blocking']); - blackListCommands.push(...blockingCommands); - } catch (e) { - // ignore error as acl cat available since Redis 6.0 - } - - pluginWhiteListCommands = filter(readOnlyCommands, (command) => !blackListCommands.includes(command)); - } catch (e) { - // ignore any error to not block main process of client creation - } - - return pluginWhiteListCommands; - } } diff --git a/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.spec.ts b/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.spec.ts index d0d829cd36..b793aa8d49 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.spec.ts @@ -3,6 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { EventEmitter2 } from '@nestjs/event-emitter'; import { mockCaCertEntity, mockClientCertEntity, mockStandaloneDatabaseEntity } from 'src/__mocks__'; import { TelemetryEvents } from 'src/constants'; +import { DEFAULT_SUMMARY as DEFAULT_REDIS_MODULES_SUMMARY } from 'src/utils/redis-modules-summary'; import { DatabaseInstanceResponse } from 'src/modules/instances/dto/database-instance.dto'; import { HostingProvider } from 'src/modules/core/models/database-instance.entity'; import { @@ -118,7 +119,7 @@ describe('InstancesAnalytics', () => { totalMemory: mockRedisGeneralInfo.usedMemory, numberedDatabases: mockRedisGeneralInfo.databases, numberOfModules: 0, - modules: [], + ...DEFAULT_REDIS_MODULES_SUMMARY, }, ); }); @@ -144,12 +145,15 @@ describe('InstancesAnalytics', () => { totalMemory: mockRedisGeneralInfo.usedMemory, numberedDatabases: mockRedisGeneralInfo.databases, numberOfModules: 0, - modules: [], + ...DEFAULT_REDIS_MODULES_SUMMARY, }, ); }); it('should emit event without additional info', () => { - const instance = { ...mockDatabaseInstanceDto, modules: [{ name: 'search', version: 20000 }] }; + const instance = { + ...mockDatabaseInstanceDto, + modules: [{ name: 'search', version: 20000 }, { name: 'rediSQL', version: 1 }], + }; service.sendInstanceAddedEvent(instance, { version: mockRedisGeneralInfo.version, }); @@ -168,8 +172,13 @@ describe('InstancesAnalytics', () => { numberOfKeysRange: undefined, totalMemory: undefined, numberedDatabases: undefined, - numberOfModules: 1, - modules: [{ name: 'search', version: 20000 }], + numberOfModules: 2, + ...DEFAULT_REDIS_MODULES_SUMMARY, + RediSearch: { + loaded: true, + version: 20000, + }, + customModules: [{ name: 'rediSQL', version: 1 }], }, ); }); diff --git a/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.ts b/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.ts index 6f77675631..164c4b22e7 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/instances-analytics.service.ts @@ -5,6 +5,7 @@ import { getRangeForNumber, TOTAL_KEYS_BREAKPOINTS } from 'src/utils'; import { DatabaseInstanceResponse } from 'src/modules/instances/dto/database-instance.dto'; import { RedisDatabaseInfoResponse } from 'src/modules/instances/dto/redis-info.dto'; import { TelemetryBaseService } from 'src/modules/shared/services/base/telemetry.base.service'; +import { getRedisModulesSummary } from 'src/utils/redis-modules-summary'; @Injectable() export class InstancesAnalyticsService extends TelemetryBaseService { @@ -34,6 +35,7 @@ export class InstancesAnalyticsService extends TelemetryBaseService { additionalInfo: RedisDatabaseInfoResponse, ): void { try { + const modulesSummary = getRedisModulesSummary(instance.modules); this.sendEvent( TelemetryEvents.RedisInstanceAdded, { @@ -53,7 +55,7 @@ export class InstancesAnalyticsService extends TelemetryBaseService { totalMemory: additionalInfo.usedMemory, numberedDatabases: additionalInfo.databases, numberOfModules: instance.modules.length, - modules: instance.modules, + ...modulesSummary, }, ); } catch (e) { diff --git a/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.spec.ts b/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.spec.ts index 4fe3d4d819..86ea13d699 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.spec.ts @@ -1,5 +1,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { EventEmitter2 } from '@nestjs/event-emitter'; import { BadRequestException, GatewayTimeoutException, @@ -15,7 +16,6 @@ import { mockClientCertEntity, mockDatabasesProvider, mockInstancesAnalyticsService, - mockPluginWhiteListCommandsResponse, mockRepository, mockSentinelDatabaseEntity, mockStandaloneDatabaseEntity, @@ -136,6 +136,7 @@ describe('InstancesBusinessService', () => { const module: TestingModule = await Test.createTestingModule({ providers: [ InstancesBusinessService, + EventEmitter2, { provide: RedisSentinelBusinessService, useFactory: () => ({}), @@ -783,68 +784,4 @@ describe('InstancesBusinessService', () => { } }); }); - - describe('getPluginCommands', () => { - const mockClient = new Redis(); - beforeEach(() => { - service.connectToInstance = jest.fn(); - redisService.getClientInstance = jest.fn().mockReturnValue(undefined); - redisService.isClientConnected = jest.fn(); - redisConfBusinessService.getPluginWhiteListCommands = jest - .fn().mockResolvedValue(mockPluginWhiteListCommandsResponse); - }); - it('successfully get plugin commands by using exist client', async () => { - redisService.getClientInstance.mockReturnValue(mockRedisClientInstance); - redisService.isClientConnected = jest.fn().mockReturnValue(true); - redisConfBusinessService.getRedisGeneralInfo = jest.fn().mockResolvedValue(mockRedisGeneralInfo); - - const result = await service.getPluginCommands(mockStandaloneDatabaseEntity.id); - - expect(result).toEqual(mockPluginWhiteListCommandsResponse); - expect(service.connectToInstance).not.toHaveBeenCalled(); - expect(redisConfBusinessService.getPluginWhiteListCommands).toHaveBeenCalledWith( - mockRedisClientInstance.client, - ); - }); - it('successfully get plugin commands without storing client', async () => { - service.connectToInstance = jest.fn().mockResolvedValue(mockClient); - - const result = await service.getPluginCommands(mockStandaloneDatabaseEntity.id); - - expect(result).toEqual(mockPluginWhiteListCommandsResponse); - expect(service.connectToInstance).toHaveBeenCalledWith( - mockStandaloneDatabaseEntity.id, - AppTool.Browser, - true, - ); - expect(redisConfBusinessService.getPluginWhiteListCommands).toHaveBeenCalledWith( - mockClient, - ); - }); - it('successfully get plugin commands and store client', async () => { - service.connectToInstance = jest.fn().mockResolvedValue(mockClient); - - const result = await service.getPluginCommands(mockStandaloneDatabaseEntity.id); - - expect(result).toEqual(mockPluginWhiteListCommandsResponse); - expect(service.connectToInstance).toHaveBeenCalledWith( - mockStandaloneDatabaseEntity.id, - AppTool.Browser, - true, - ); - - expect(redisConfBusinessService.getPluginWhiteListCommands).toHaveBeenCalledWith(mockClient); - }); - - it('throw error database instance not found when trying to get plugin commands', async () => { - service.connectToInstance = jest.fn().mockRejectedValue(new NotFoundException()); - - await expect( - service.getPluginCommands(mockStandaloneDatabaseEntity.id), - ).rejects.toThrow(NotFoundException); - expect( - redisConfBusinessService.getPluginWhiteListCommands, - ).not.toHaveBeenCalled(); - }); - }); }); diff --git a/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.ts b/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.ts index 86168533df..3bb16061ce 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.ts @@ -7,10 +7,11 @@ import { ServiceUnavailableException, } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { EventEmitter2 } from '@nestjs/event-emitter'; import { Repository } from 'typeorm'; import IORedis from 'ioredis'; import { find, omit } from 'lodash'; -import { RedisErrorCodes } from 'src/constants'; +import { AppRedisInstanceEvents, RedisErrorCodes } from 'src/constants'; import ERROR_MESSAGES from 'src/constants/error-messages'; import { catchRedisConnectionError, @@ -83,6 +84,7 @@ export class InstancesBusinessService { private redisConfBusinessService: ConfigurationBusinessService, private overviewService: OverviewService, private instancesAnalyticsService: InstancesAnalyticsService, + private eventEmitter: EventEmitter2, ) {} async exists(id: string) { @@ -208,11 +210,13 @@ export class InstancesBusinessService { const instance = await this.databasesProvider.getOneById(id, true); try { await this.instanceRepository.delete(id); + this.redisService.removeClientInstance({ instanceId: id }); + this.logger.log('Succeed to delete database instance.'); + this.instancesAnalyticsService.sendInstanceDeletedEvent( convertEntityToDto(instance), ); - this.logger.log('Succeed to delete database instance.'); - this.redisService.removeClientInstance({ instanceId: id }); + this.eventEmitter.emit(AppRedisInstanceEvents.Deleted, id); return; } catch (error) { this.logger.error(`Failed to delete database instance ${id}`, error); @@ -229,11 +233,10 @@ export class InstancesBusinessService { this.instancesAnalyticsService.sendInstanceDeletedEvent( convertEntityToDto(item), ); + this.eventEmitter.emit(AppRedisInstanceEvents.Deleted, item.id); }); const res = await this.instanceRepository.remove(instances); - this.logger.log( - `Succeed to delete many database instances. Affected: ${res.length}`, - ); + this.logger.log(`Succeed to delete many database instances. Affected: ${res.length}`); return { affected: res.length }; } catch (error) { this.logger.error('Failed to delete many database instances', error); @@ -276,6 +279,7 @@ export class InstancesBusinessService { client, ); } + this.logger.log(`Succeed connection to database instance. id: ${id}`); return client; } catch (error) { this.logger.error(`Failed connection to database instance ${id}`, error); @@ -670,19 +674,4 @@ export class InstancesBusinessService { throw catchRedisConnectionError(error, databaseDto); } } - - /** - * Get whitelisted commands available for plugins for particular database - */ - async getPluginCommands( - instanceId: string, - tool = AppTool.Browser, - ): Promise { - let client = this.redisService.getClientInstance({ instanceId, tool })?.client; - if (!client || !this.redisService.isClientConnected(client)) { - client = await this.connectToInstance(instanceId, tool, true); - } - - return await this.redisConfBusinessService.getPluginWhiteListCommands(client); - } } diff --git a/redisinsight/api/src/modules/shared/services/instances-business/overview.service.spec.ts b/redisinsight/api/src/modules/shared/services/instances-business/overview.service.spec.ts index fb60bdbe54..5f6afb715f 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/overview.service.spec.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/overview.service.spec.ts @@ -95,9 +95,10 @@ describe('OverviewService', () => { connectedClients: 1, totalKeys: 1, usedMemory: 1000000, - opsPerSecond: 0, - networkInKbps: 0, - networkOutKbps: 0, + cpuUsagePercentage: undefined, + opsPerSecond: undefined, + networkInKbps: undefined, + networkOutKbps: undefined, }); }); it('check for cpu on second attempt', async () => { @@ -148,6 +149,25 @@ describe('OverviewService', () => { cpuUsagePercentage: 100, }); }); + it('should not return cpu (undefined) when used_cpu_sys = 0', async () => { + spyGetNodeInfo.mockResolvedValueOnce({ + ...mockNodeInfo, + server: { + ...mockNodeInfo.server, + uptime_in_seconds: '2', + }, + cpu: { + ...mockNodeInfo.cpu, + used_cpu_sys: '0', + used_cpu_user: '1.50002', + }, + }); + + expect(await service.getOverview(databaseId, mockClient)).toEqual({ + ...mockDatabaseOverview, + cpuUsagePercentage: undefined, + }); + }); }); describe('Cluster', () => { it('Should calculate overview and ignore replica where needed', async () => { diff --git a/redisinsight/api/src/modules/shared/services/instances-business/overview.service.ts b/redisinsight/api/src/modules/shared/services/instances-business/overview.service.ts index d09a601783..be97eba01c 100644 --- a/redisinsight/api/src/modules/shared/services/instances-business/overview.service.ts +++ b/redisinsight/api/src/modules/shared/services/instances-business/overview.service.ts @@ -109,6 +109,10 @@ export class OverviewService { * @private */ private calculateOpsPerSec(nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'stats.instantaneous_ops_per_sec', [undefined])) { + return undefined; + } + return sumBy(nodes, (node) => parseInt( get(node, 'stats.instantaneous_ops_per_sec', 0), 10, @@ -121,6 +125,10 @@ export class OverviewService { * @private */ private calculateNetworkIn(nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'stats.instantaneous_input_kbps', [undefined])) { + return undefined; + } + return sumBy(nodes, (node) => parseInt( get(node, 'stats.instantaneous_input_kbps', 0), 10, @@ -133,6 +141,10 @@ export class OverviewService { * @private */ private calculateNetworkOut(nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'stats.instantaneous_output_kbps', [undefined])) { + return undefined; + } + return sumBy(nodes, (node) => parseInt( get(node, 'stats.instantaneous_output_kbps', 0), 10, @@ -145,6 +157,10 @@ export class OverviewService { * @private */ private calculateConnectedClients(nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'clients.connected_clients', [undefined])) { + return undefined; + } + const clientsPerNode = map(nodes, (node) => parseInt(get(node, 'clients.connected_clients', 0), 10)); return this.getMedianValue(clientsPerNode); } @@ -156,7 +172,13 @@ export class OverviewService { */ private calculateUsedMemory(nodes = []): number { try { - const masterNodes = filter(nodes, (node) => get(node, 'replication.role') === 'master'); + const masterNodes = filter(nodes, (node) => ['master', undefined].includes( + get(node, 'replication.role'), + )); + + if (!this.isMetricsAvailable(masterNodes, 'memory.used_memory', [undefined])) { + return undefined; + } return sumBy(masterNodes, (node) => parseInt(get(node, 'memory.used_memory', 0), 10)); } catch (e) { @@ -171,8 +193,15 @@ export class OverviewService { * @private */ private calculateTotalKeys(nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'keyspace', [undefined])) { + return undefined; + } + try { - const masterNodes = filter(nodes, (node) => get(node, 'replication.role') === 'master'); + const masterNodes = filter(nodes, (node) => ['master', undefined].includes( + get(node, 'replication.role'), + )); + return sumBy(masterNodes, (node) => sum( map( get(node, 'keyspace', {}), @@ -201,6 +230,10 @@ export class OverviewService { * @private */ private calculateCpuUsage(id: string, nodes = []): number { + if (!this.isMetricsAvailable(nodes, 'cpu.used_cpu_sys', [0, '0', '0.0', '0.00', undefined])) { + return undefined; + } + const previousCpuStats = this.previousCpuStats.get(id); const currentCpuStats = keyBy(map(nodes, (node) => ({ @@ -241,4 +274,24 @@ export class OverviewService { return usage > 100 ? 100 : usage; })); } + + /** + * Check that metric has expected value or provided + * + * @param nodes + * @param path + * @param values + * @private + */ + private isMetricsAvailable(nodes = [], path: string[] | string, values: any[]): boolean { + for (let i = 0; i < nodes.length; i += 1) { + const node = nodes[i]; + + if (values.includes(get(node, path))) { + return false; + } + } + + return true; + } } diff --git a/redisinsight/api/src/modules/shared/shared.module.ts b/redisinsight/api/src/modules/shared/shared.module.ts index 0afc937e59..078c831da8 100644 --- a/redisinsight/api/src/modules/shared/shared.module.ts +++ b/redisinsight/api/src/modules/shared/shared.module.ts @@ -8,6 +8,7 @@ import { } from 'src/modules/shared/services/redis-sentinel-business/redis-sentinel-business.service'; import { DatabasesProvider } from 'src/modules/shared/services/instances-business/databases.provider'; import { OverviewService } from 'src/modules/shared/services/instances-business/overview.service'; +import { RedisToolFactory } from 'src/modules/shared/services/base/redis-tool.factory'; import { InstancesBusinessService } from './services/instances-business/instances-business.service'; import { RedisEnterpriseBusinessService } from './services/redis-enterprise-business/redis-enterprise-business.service'; import { RedisCloudBusinessService } from './services/redis-cloud-business/redis-cloud-business.service'; @@ -36,6 +37,7 @@ const SERVER_CONFIG = config.get('server'); OverviewService, RedisSentinelBusinessService, AutodiscoveryAnalyticsService, + RedisToolFactory, ], exports: [ InstancesBusinessService, @@ -43,6 +45,7 @@ const SERVER_CONFIG = config.get('server'); RedisCloudBusinessService, ConfigurationBusinessService, RedisSentinelBusinessService, + RedisToolFactory, ], }) export class SharedModule {} diff --git a/redisinsight/api/src/modules/workbench/dto/create-command-execution.dto.ts b/redisinsight/api/src/modules/workbench/dto/create-command-execution.dto.ts new file mode 100644 index 0000000000..1bc1948350 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/dto/create-command-execution.dto.ts @@ -0,0 +1,46 @@ +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { + IsEnum, IsNotEmpty, IsNotEmptyObject, IsOptional, IsString, ValidateNested, +} from 'class-validator'; +import { Type } from 'class-transformer'; +import { ClusterSingleNodeOptions } from 'src/modules/cli/dto/cli.dto'; + +export enum ClusterNodeRole { + All = 'ALL', + Master = 'MASTER', + Slave = 'SLAVE', +} + +export class CreateCommandExecutionDto { + @ApiProperty({ + type: String, + description: 'Redis command', + }) + @IsString() + @IsNotEmpty() + command: string; + + @ApiPropertyOptional({ + description: 'Execute command for nodes with defined role', + default: ClusterNodeRole.All, + enum: ClusterNodeRole, + }) + @IsOptional() + @IsEnum(ClusterNodeRole, { + message: `role must be a valid enum value. Valid values: ${Object.values( + ClusterNodeRole, + )}.`, + }) + role?: ClusterNodeRole; + + @ApiPropertyOptional({ + description: + 'Should be provided if only one node needs to execute the command.', + type: ClusterSingleNodeOptions, + }) + @IsOptional() + @IsNotEmptyObject() + @Type(() => ClusterSingleNodeOptions) + @ValidateNested() + nodeOptions?: ClusterSingleNodeOptions; +} diff --git a/redisinsight/api/src/modules/workbench/dto/create-plugin-state.dto.ts b/redisinsight/api/src/modules/workbench/dto/create-plugin-state.dto.ts new file mode 100644 index 0000000000..0ee21917db --- /dev/null +++ b/redisinsight/api/src/modules/workbench/dto/create-plugin-state.dto.ts @@ -0,0 +1,14 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsNotIn } from 'class-validator'; + +export class CreatePluginStateDto { + @ApiProperty({ + type: String, + example: 'any', + description: 'State can be anything except "undefined"', + }) + @IsNotIn([undefined], { + message: 'state should be defined', + }) + state: any; +} diff --git a/redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts b/redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts new file mode 100644 index 0000000000..e65393cbf7 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts @@ -0,0 +1,63 @@ +import { + Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, JoinColumn, Index, +} from 'typeorm'; +import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity'; +import { Transform } from 'class-transformer'; + +@Entity('command_execution') +export class CommandExecutionEntity { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column({ nullable: false }) + databaseId: string; + + @ManyToOne( + () => DatabaseInstanceEntity, + { + nullable: false, + onDelete: 'CASCADE', + }, + ) + @JoinColumn({ name: 'databaseId' }) + database: DatabaseInstanceEntity; + + @Column({ nullable: false, type: 'text' }) + command: string; + + @Column({ nullable: false, type: 'text' }) + @Transform((object) => JSON.stringify(object), { toClassOnly: true }) + @Transform((string) => { + try { + return JSON.parse(string); + } catch (e) { + return undefined; + } + }, { toPlainOnly: true }) + result: string; + + @Column({ nullable: true }) + role?: string; + + @Column({ nullable: true }) + @Transform((object) => JSON.stringify(object), { toClassOnly: true }) + @Transform((string) => { + try { + return JSON.parse(string); + } catch (e) { + return undefined; + } + }, { toPlainOnly: true }) + nodeOptions?: string; + + @Column({ nullable: true }) + encryption: string; + + @CreateDateColumn() + @Index() + createdAt: Date; + + constructor(entity: Partial) { + Object.assign(this, entity); + } +} diff --git a/redisinsight/api/src/modules/workbench/entities/plugin-state.entity.ts b/redisinsight/api/src/modules/workbench/entities/plugin-state.entity.ts new file mode 100644 index 0000000000..929c999c9d --- /dev/null +++ b/redisinsight/api/src/modules/workbench/entities/plugin-state.entity.ts @@ -0,0 +1,54 @@ +import { + Column, + CreateDateColumn, + Entity, + ManyToOne, + JoinColumn, + UpdateDateColumn, + PrimaryColumn, +} from 'typeorm'; +import { Transform } from 'class-transformer'; +import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity'; + +@Entity('plugin_state') +export class PluginStateEntity { + @PrimaryColumn() + commandExecutionId: string; + + @ManyToOne( + () => CommandExecutionEntity, + { + nullable: false, + onDelete: 'CASCADE', + }, + ) + @JoinColumn({ name: 'commandExecutionId' }) + commandExecution: CommandExecutionEntity; + + @PrimaryColumn() + visualizationId: string; + + @Column({ nullable: false, type: 'text' }) + @Transform((object) => JSON.stringify(object), { toClassOnly: true }) + @Transform((string) => { + try { + return JSON.parse(string); + } catch (e) { + return undefined; + } + }, { toPlainOnly: true }) + state: string; + + @Column({ nullable: true }) + encryption: string; + + @CreateDateColumn() + createdAt: Date; + + @UpdateDateColumn() + updatedAt: Date; + + constructor(entity: Partial) { + Object.assign(this, entity); + } +} diff --git a/redisinsight/api/src/modules/workbench/models/command-execution-result.ts b/redisinsight/api/src/modules/workbench/models/command-execution-result.ts new file mode 100644 index 0000000000..2fb81f716d --- /dev/null +++ b/redisinsight/api/src/modules/workbench/models/command-execution-result.ts @@ -0,0 +1,37 @@ +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { EndpointDto } from 'src/modules/instances/dto/database-instance.dto'; + +class ClusterNode extends EndpointDto { + @ApiPropertyOptional({ + description: 'Cluster node slot.', + type: Number, + example: 0, + }) + slot?: number; +} + +export class CommandExecutionResult { + @ApiProperty({ + description: 'Redis CLI command execution status', + default: CommandExecutionStatus.Success, + enum: CommandExecutionStatus, + }) + status: CommandExecutionStatus; + + @ApiProperty({ + type: String, + description: 'Redis response', + }) + response: any; + + @ApiPropertyOptional({ + type: () => ClusterNode, + description: 'Redis Cluster Node info', + }) + node?: ClusterNode; + + constructor(partial: Partial = {}) { + Object.assign(this, partial); + } +} diff --git a/redisinsight/api/src/modules/workbench/models/command-execution.ts b/redisinsight/api/src/modules/workbench/models/command-execution.ts new file mode 100644 index 0000000000..9c9c0d4964 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/models/command-execution.ts @@ -0,0 +1,62 @@ +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { ClusterNodeRole } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { ClusterSingleNodeOptions } from 'src/modules/cli/dto/cli.dto'; +import { Expose } from 'class-transformer'; + +export class CommandExecution { + @ApiProperty({ + description: 'Command execution id', + type: String, + }) + @Expose() + id: string; + + @ApiProperty({ + description: 'Database id', + type: String, + }) + @Expose() + databaseId: string; + + @ApiProperty({ + description: 'Redis command executed', + type: String, + }) + @Expose() + command: string; + + @ApiProperty({ + description: 'Command execution result', + type: () => CommandExecutionResult, + isArray: true, + }) + @Expose() + result: CommandExecutionResult[]; + + @ApiPropertyOptional({ + description: 'Nodes roles where command was executed', + default: ClusterNodeRole.All, + enum: ClusterNodeRole, + }) + @Expose() + role?: ClusterNodeRole; + + @ApiPropertyOptional({ + description: 'Node where command was executed', + type: ClusterSingleNodeOptions, + }) + @Expose() + nodeOptions?: ClusterSingleNodeOptions; + + @ApiProperty({ + description: 'Date of command execution', + type: Date, + }) + @Expose() + createdAt: Date; + + constructor(partial: Partial = {}) { + Object.assign(this, partial); + } +} diff --git a/redisinsight/api/src/modules/workbench/models/plugin-command-execution.ts b/redisinsight/api/src/modules/workbench/models/plugin-command-execution.ts new file mode 100644 index 0000000000..8dc38bb30f --- /dev/null +++ b/redisinsight/api/src/modules/workbench/models/plugin-command-execution.ts @@ -0,0 +1,11 @@ +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { OmitType, PartialType } from '@nestjs/swagger'; + +export class PluginCommandExecution extends PartialType( + OmitType(CommandExecution, ['createdAt', 'id'] as const), +) { + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/redisinsight/api/src/modules/workbench/models/plugin-state.ts b/redisinsight/api/src/modules/workbench/models/plugin-state.ts new file mode 100644 index 0000000000..f39b8566c6 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/models/plugin-state.ts @@ -0,0 +1,44 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { Expose } from 'class-transformer'; + +export class PluginState { + @ApiProperty({ + description: 'Plugin visualization id. Should be unique per all plugins', + type: String, + }) + @Expose() + visualizationId: string; + + @ApiProperty({ + description: 'Command Execution id', + type: String, + }) + @Expose() + commandExecutionId: string; + + @ApiProperty({ + type: String, + example: 'any', + description: 'Stored state', + }) + @Expose() + state: any; + + @ApiProperty({ + description: 'Date of creation', + type: Date, + }) + @Expose() + createdAt: Date; + + @ApiProperty({ + description: 'Date of updating', + type: Date, + }) + @Expose() + updatedAt: Date; + + constructor(partial: Partial = {}) { + Object.assign(this, partial); + } +} diff --git a/redisinsight/api/src/modules/workbench/models/short-command-execution.ts b/redisinsight/api/src/modules/workbench/models/short-command-execution.ts new file mode 100644 index 0000000000..5bf2585231 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/models/short-command-execution.ts @@ -0,0 +1,6 @@ +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { OmitType, PartialType } from '@nestjs/swagger'; + +export class ShortCommandExecution extends PartialType( + OmitType(CommandExecution, ['result'] as const), +) {} diff --git a/redisinsight/api/src/modules/workbench/plugins.controller.ts b/redisinsight/api/src/modules/workbench/plugins.controller.ts new file mode 100644 index 0000000000..50a24d652d --- /dev/null +++ b/redisinsight/api/src/modules/workbench/plugins.controller.ts @@ -0,0 +1,101 @@ +import { + Body, ClassSerializerInterceptor, Controller, Get, Param, Post, UseInterceptors, UsePipes, ValidationPipe, +} from '@nestjs/common'; +import { ApiTags } from '@nestjs/swagger'; +import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator'; +import { ApiRedisParams } from 'src/decorators/api-redis-params.decorator'; +import { AppTool } from 'src/models'; +import { CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { PluginsService } from 'src/modules/workbench/plugins.service'; +import { PluginCommandExecution } from 'src/modules/workbench/models/plugin-command-execution'; +import { CreatePluginStateDto } from 'src/modules/workbench/dto/create-plugin-state.dto'; +import { PluginState } from 'src/modules/workbench/models/plugin-state'; + +@ApiTags('Plugins') +@UsePipes(new ValidationPipe({ transform: true })) +@Controller('plugins') +export class PluginsController { + constructor(private service: PluginsService) {} + + @ApiEndpoint({ + description: 'Send Redis Command from the Workbench', + statusCode: 200, + responses: [ + { + status: 200, + type: PluginCommandExecution, + }, + ], + }) + @Post('/command-executions') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async sendCommand( + @Param('dbInstance') dbInstance: string, + @Body() dto: CreateCommandExecutionDto, + ): Promise { + return this.service.sendCommand( + { + instanceId: dbInstance, + tool: AppTool.Workbench, + }, + dto, + ); + } + + @ApiEndpoint({ + description: 'Get Redis whitelist commands available for plugins', + statusCode: 200, + responses: [ + { + status: 200, + description: 'List of available commands', + type: [String], + }, + ], + }) + @Get('/commands') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async getPluginCommands( + @Param('dbInstance') databaseId: string, + ): Promise { + return this.service.getWhitelistCommands(databaseId); + } + + @ApiEndpoint({ + description: 'Save plugin state for particular command execution', + statusCode: 201, + }) + @Post('/:visualizationId/command-executions/:id/state') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async saveState( + @Param('visualizationId') visualizationId: string, + @Param('id') commandExecutionId: string, + @Body() dto: CreatePluginStateDto, + ): Promise { + await this.service.saveState(visualizationId, commandExecutionId, dto); + } + + @ApiEndpoint({ + description: 'Get previously saved state', + statusCode: 200, + responses: [ + { + status: 200, + description: 'Plugin state', + type: () => PluginState, + }, + ], + }) + @Get('/:visualizationId/command-executions/:id/state') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async getState( + @Param('visualizationId') visualizationId: string, + @Param('id') commandExecutionId: string, + ): Promise { + return this.service.getState(visualizationId, commandExecutionId); + } +} diff --git a/redisinsight/api/src/modules/workbench/plugins.service.spec.ts b/redisinsight/api/src/modules/workbench/plugins.service.spec.ts new file mode 100644 index 0000000000..ef5dccaeef --- /dev/null +++ b/redisinsight/api/src/modules/workbench/plugins.service.spec.ts @@ -0,0 +1,214 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { mockStandaloneDatabaseEntity, mockWhitelistCommandsResponse } from 'src/__mocks__'; +import { v4 as uuidv4 } from 'uuid'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { ClusterNodeRole, CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { BadRequestException } from '@nestjs/common'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { PluginsService } from 'src/modules/workbench/plugins.service'; +import { PluginCommandsWhitelistProvider } from 'src/modules/workbench/providers/plugin-commands-whitelist.provider'; +import { PluginCommandExecution } from 'src/modules/workbench/models/plugin-command-execution'; +import { PluginStateProvider } from 'src/modules/workbench/providers/plugin-state.provider'; +import { PluginState } from 'src/modules/workbench/models/plugin-state'; +import config from 'src/utils/config'; + +const PLUGINS_CONFIG = config.get('plugins'); + +const mockClientOptions: IFindRedisClientInstanceByOptions = { + instanceId: mockStandaloneDatabaseEntity.id, +}; + +const mockCreateCommandExecutionDto: CreateCommandExecutionDto = { + command: 'get foo', + nodeOptions: { + host: '127.0.0.1', + port: 7002, + enableRedirection: true, + }, + role: ClusterNodeRole.All, +}; + +const mockCommandExecutionResults: CommandExecutionResult[] = [ + new CommandExecutionResult({ + status: CommandExecutionStatus.Success, + response: 'OK', + node: { + host: '127.0.0.1', + port: 6379, + slot: 0, + }, + }), +]; +const mockPluginCommandExecution = new PluginCommandExecution({ + ...mockCreateCommandExecutionDto, + databaseId: mockStandaloneDatabaseEntity.id, + result: mockCommandExecutionResults, +}); + +const mockVisualizationId = 'pluginName_visualizationName'; +const mockCommandExecutionId = uuidv4(); +const mockState = { + some: 'object', +}; + +const mockPluginState: PluginState = new PluginState({ + visualizationId: mockVisualizationId, + commandExecutionId: mockCommandExecutionId, + state: mockState, + createdAt: new Date(), + updatedAt: new Date(), +}); + +const mockPluginCommandsWhitelistProvider = () => ({ + getWhitelistCommands: jest.fn(), +}); + +const mockPluginStateProvider = () => ({ + upsert: jest.fn(), + getOne: jest.fn(), +}); + +describe('PluginsService', () => { + let service: PluginsService; + let workbenchCommandsExecutor; + let pluginsCommandsWhitelistProvider; + let pluginStateProvider; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PluginsService, + { + provide: WorkbenchCommandsExecutor, + useFactory: () => ({ + sendCommand: jest.fn(), + }), + }, + { + provide: PluginCommandsWhitelistProvider, + useFactory: mockPluginCommandsWhitelistProvider, + }, + { + provide: PluginStateProvider, + useFactory: mockPluginStateProvider, + }, + ], + }).compile(); + + service = module.get(PluginsService); + workbenchCommandsExecutor = module.get(WorkbenchCommandsExecutor); + pluginsCommandsWhitelistProvider = module.get(PluginCommandsWhitelistProvider); + pluginStateProvider = module.get(PluginStateProvider); + }); + + describe('sendCommand', () => { + it('should successfully execute command', async () => { + workbenchCommandsExecutor.sendCommand.mockResolvedValueOnce(mockCommandExecutionResults); + pluginsCommandsWhitelistProvider.getWhitelistCommands.mockResolvedValueOnce(mockWhitelistCommandsResponse); + + const result = await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + + expect(result).toEqual(mockPluginCommandExecution); + expect(workbenchCommandsExecutor.sendCommand).toHaveBeenCalled(); + }); + it('should return status failed when unsupported command called', async () => { + const dto = { + command: 'subscribe', + }; + + pluginsCommandsWhitelistProvider.getWhitelistCommands.mockResolvedValueOnce(mockWhitelistCommandsResponse); + + const result = await service.sendCommand(mockClientOptions, dto); + + expect(result).toEqual(new PluginCommandExecution({ + ...dto, + databaseId: mockClientOptions.instanceId, + result: [new CommandExecutionResult({ + response: ERROR_MESSAGES.PLUGIN_COMMAND_NOT_SUPPORTED('subscribe'.toUpperCase()), + status: CommandExecutionStatus.Fail, + })], + })); + expect(workbenchCommandsExecutor.sendCommand).not.toHaveBeenCalled(); + }); + it('should throw an error when command execution failed', async () => { + pluginsCommandsWhitelistProvider.getWhitelistCommands.mockResolvedValueOnce(mockWhitelistCommandsResponse); + workbenchCommandsExecutor.sendCommand.mockRejectedValueOnce(new BadRequestException('error')); + + const dto = { + ...mockCommandExecutionResults, + command: 'get foo', + }; + + try { + await service.sendCommand(mockClientOptions, dto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + } + }); + }); + describe('getWhitelistCommands', () => { + it('should successfully return whitelisted commands', async () => { + workbenchCommandsExecutor.sendCommand.mockResolvedValueOnce(mockCommandExecutionResults); + pluginsCommandsWhitelistProvider.getWhitelistCommands.mockResolvedValueOnce(mockWhitelistCommandsResponse); + + const result = await service.getWhitelistCommands(mockClientOptions.instanceId); + + expect(result).toEqual(mockWhitelistCommandsResponse); + }); + }); + describe('saveState', () => { + it('should successfully save state', async () => { + pluginStateProvider.upsert.mockResolvedValueOnce(mockPluginState); + + const dto = { + state: mockState, + }; + const result = await service.saveState(mockVisualizationId, mockCommandExecutionId, dto); + + expect(result).toEqual(undefined); + }); + it('should throw an error when state too large', async () => { + pluginStateProvider.upsert.mockResolvedValueOnce(mockPluginState); + + try { + const dto = { + state: Buffer.alloc(PLUGINS_CONFIG.stateMaxSize + 1, 0), + }; + await service.saveState(mockVisualizationId, mockCommandExecutionId, dto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + expect(e.message).toEqual(ERROR_MESSAGES.PLUGIN_STATE_MAX_SIZE(PLUGINS_CONFIG.stateMaxSize)); + } + expect(pluginStateProvider.upsert).not.toHaveBeenCalled(); + }); + }); + describe('getState', () => { + it('should successfully save state', async () => { + pluginStateProvider.getOne.mockResolvedValueOnce(mockPluginState); + + const result = await service.getState(mockVisualizationId, mockCommandExecutionId); + + expect(result).toEqual(mockPluginState); + }); + it('should throw an error when state too large', async () => { + pluginStateProvider.upsert.mockResolvedValueOnce(mockPluginState); + + try { + const dto = { + state: Buffer.alloc(PLUGINS_CONFIG.stateMaxSize + 1, 0), + }; + await service.saveState(mockVisualizationId, mockCommandExecutionId, dto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + expect(e.message).toEqual(ERROR_MESSAGES.PLUGIN_STATE_MAX_SIZE(PLUGINS_CONFIG.stateMaxSize)); + } + expect(pluginStateProvider.upsert).not.toHaveBeenCalled(); + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/plugins.service.ts b/redisinsight/api/src/modules/workbench/plugins.service.ts new file mode 100644 index 0000000000..341c51993f --- /dev/null +++ b/redisinsight/api/src/modules/workbench/plugins.service.ts @@ -0,0 +1,119 @@ +import { BadRequestException, Injectable } from '@nestjs/common'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { CliCommandNotSupportedError } from 'src/modules/cli/constants/errors'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { PluginCommandExecution } from 'src/modules/workbench/models/plugin-command-execution'; +import { plainToClass } from 'class-transformer'; +import { PluginCommandsWhitelistProvider } from 'src/modules/workbench/providers/plugin-commands-whitelist.provider'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CreatePluginStateDto } from 'src/modules/workbench/dto/create-plugin-state.dto'; +import { PluginStateProvider } from 'src/modules/workbench/providers/plugin-state.provider'; +import { PluginState } from 'src/modules/workbench/models/plugin-state'; +import config from 'src/utils/config'; + +const PLUGINS_CONFIG = config.get('plugins'); + +@Injectable() +export class PluginsService { + constructor( + private commandsExecutor: WorkbenchCommandsExecutor, + private pluginStateProvider: PluginStateProvider, + private whitelistProvider: PluginCommandsWhitelistProvider, + ) {} + + /** + * Send redis command from workbench and save history + * + * @param clientOptions + * @param dto + */ + async sendCommand( + clientOptions: IFindRedisClientInstanceByOptions, + dto: CreateCommandExecutionDto, + ): Promise { + try { + await this.checkWhitelistedCommands(clientOptions.instanceId, dto.command); + + const result = await this.commandsExecutor.sendCommand(clientOptions, dto); + + return plainToClass(PluginCommandExecution, { + ...dto, + databaseId: clientOptions.instanceId, + result, + }); + } catch (error) { + if (error instanceof CliCommandNotSupportedError) { + return new PluginCommandExecution({ + ...dto, + databaseId: clientOptions.instanceId, + result: [new CommandExecutionResult({ + response: error.message, + status: CommandExecutionStatus.Fail, + })], + }); + } + + throw error; + } + } + + /** + * Get database white listed commands for plugins + * @param instanceId + */ + async getWhitelistCommands(instanceId: string): Promise { + return await this.whitelistProvider.getWhitelistCommands(instanceId); + } + + /** + * Save plugin state + * + * @param visualizationId + * @param commandExecutionId + * @param dto + */ + async saveState(visualizationId: string, commandExecutionId: string, dto: CreatePluginStateDto): Promise { + if (JSON.stringify(dto.state).length > PLUGINS_CONFIG.stateMaxSize) { + throw new BadRequestException(ERROR_MESSAGES.PLUGIN_STATE_MAX_SIZE(PLUGINS_CONFIG.stateMaxSize)); + } + + await this.pluginStateProvider.upsert({ + visualizationId, + commandExecutionId, + ...dto, + }); + } + + /** + * Get plugin state + * + * @param visualizationId + * @param commandExecutionId + */ + async getState(visualizationId: string, commandExecutionId: string): Promise { + return this.pluginStateProvider.getOne(visualizationId, commandExecutionId); + } + + /** + * Check if command outside workbench commands black list + * @param databaseId + * @param commandLine + * @private + */ + private async checkWhitelistedCommands(databaseId: string, commandLine: string) { + const targetCommand = commandLine.toLowerCase(); + + const whitelist = await this.getWhitelistCommands(databaseId); + + if (!whitelist.find((command) => targetCommand.startsWith(command))) { + throw new CliCommandNotSupportedError( + ERROR_MESSAGES.PLUGIN_COMMAND_NOT_SUPPORTED( + (targetCommand.split(' '))[0].toUpperCase(), + ), + ); + } + } +} diff --git a/redisinsight/api/src/modules/workbench/providers/command-execution.provider.spec.ts b/redisinsight/api/src/modules/workbench/providers/command-execution.provider.spec.ts new file mode 100644 index 0000000000..774f9f70ef --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/command-execution.provider.spec.ts @@ -0,0 +1,237 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { v4 as uuidv4 } from 'uuid'; +import { + mockEncryptionService, + mockEncryptResult, + mockQueryBuilderGetMany, + mockQueryBuilderGetManyRaw, + mockRepository, + mockStandaloneDatabaseEntity, + MockType, +} from 'src/__mocks__'; +import { omit } from 'lodash'; +import { ClusterNodeRole, CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { NotFoundException } from '@nestjs/common'; +import { CommandExecutionProvider } from 'src/modules/workbench/providers/command-execution.provider'; +import { EncryptionService } from 'src/modules/core/encryption/encryption.service'; +import { Repository } from 'typeorm'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity'; +import { KeytarDecryptionErrorException } from 'src/modules/core/encryption/exceptions'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { ICliExecResultFromNode } from 'src/modules/shared/services/base/redis-tool.service'; +import config from 'src/utils/config'; + +const WORKBENCH_CONFIG = config.get('workbench'); + +const mockNodeEndpoint = { + host: '127.0.0.1', + port: 6379, +}; + +const mockCliNodeResponse: ICliExecResultFromNode = { + ...mockNodeEndpoint, + response: 'OK', + status: CommandExecutionStatus.Success, +}; + +const mockCreateCommandExecutionDto: CreateCommandExecutionDto = { + command: 'set foo bar', + nodeOptions: { + ...mockNodeEndpoint, + enableRedirection: true, + }, + role: ClusterNodeRole.All, +}; + +const mockCommandExecutionEntity = new CommandExecutionEntity({ + id: uuidv4(), + databaseId: mockStandaloneDatabaseEntity.id, + command: mockEncryptResult.data, + result: mockEncryptResult.data, + role: mockCreateCommandExecutionDto.role, + nodeOptions: JSON.stringify(mockCreateCommandExecutionDto.nodeOptions), + encryption: 'KEYTAR', + createdAt: new Date(), +}); + +const mockCommandExecutionResult: CommandExecutionResult = { + status: mockCliNodeResponse.status, + response: mockCliNodeResponse.response, + node: { + ...mockNodeEndpoint, + }, +}; + +const mockCommandExecutionPartial: Partial = new CommandExecution({ + ...mockCreateCommandExecutionDto, + databaseId: mockStandaloneDatabaseEntity.id, + result: [mockCommandExecutionResult], +}); + +describe('CommandExecutionProvider', () => { + let service: CommandExecutionProvider; + let repository: MockType>; + let encryptionService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + CommandExecutionProvider, + { + provide: getRepositoryToken(CommandExecutionEntity), + useFactory: mockRepository, + }, + { + provide: EncryptionService, + useFactory: mockEncryptionService, + }, + ], + }).compile(); + + service = module.get(CommandExecutionProvider); + repository = module.get(getRepositoryToken(CommandExecutionEntity)); + encryptionService = module.get(EncryptionService); + }); + + describe('create', () => { + it('should process new entity', async () => { + repository.save.mockReturnValueOnce(mockCommandExecutionEntity); + encryptionService.encrypt.mockReturnValue(mockEncryptResult); + + expect(await service.create(mockCommandExecutionPartial)).toEqual(new CommandExecution({ + ...mockCommandExecutionPartial, + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + })); + }); + it('should return full result even if size limit exceeded', async () => { + repository.save.mockReturnValueOnce(mockCommandExecutionEntity); + encryptionService.encrypt.mockReturnValue(mockEncryptResult); + + const executionResult = [new CommandExecutionResult({ + status: CommandExecutionStatus.Success, + response: `${Buffer.alloc(WORKBENCH_CONFIG.maxResultSize, 'a').toString()}`, + })]; + + expect(await service.create({ + ...mockCommandExecutionPartial, + result: executionResult, + })).toEqual(new CommandExecution({ + ...mockCommandExecutionPartial, + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + result: executionResult, + })); + + expect(encryptionService.encrypt).toHaveBeenLastCalledWith(JSON.stringify([ + new CommandExecutionResult({ + status: CommandExecutionStatus.Success, + response: 'Results have been deleted since they exceed 1 MB. Re-run the command to see new results.', + }), + ])); + }); + }); + describe('getList', () => { + it('should return list (2) of command execution', async () => { + const entityResponse = omit(mockCommandExecutionEntity, 'result'); + mockQueryBuilderGetMany.mockReturnValueOnce([entityResponse, entityResponse]); + encryptionService.decrypt.mockReturnValueOnce(mockCreateCommandExecutionDto.command); + encryptionService.decrypt.mockReturnValueOnce(mockCreateCommandExecutionDto.command); + + const commandExecution = new CommandExecution({ + ...omit(mockCommandExecutionPartial, ['result']), + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + }); + + expect(await service.getList(mockCommandExecutionEntity.databaseId)).toEqual([ + commandExecution, + commandExecution, + ]); + }); + it('should return list (1) of command execution without failed decrypted item', async () => { + const entityResponse = omit(mockCommandExecutionEntity, 'result'); + mockQueryBuilderGetMany.mockReturnValueOnce([entityResponse, entityResponse]); + encryptionService.decrypt.mockReturnValueOnce(mockCreateCommandExecutionDto.command); + encryptionService.decrypt.mockRejectedValueOnce(new KeytarDecryptionErrorException()); + + const commandExecution = new CommandExecution({ + ...omit(mockCommandExecutionPartial, ['result']), + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + }); + + expect(await service.getList(mockCommandExecutionEntity.databaseId)).toEqual([ + commandExecution, + ]); + }); + }); + describe('getOne', () => { + it('should return decrypted and transformed command execution', async () => { + repository.findOne.mockResolvedValueOnce(mockCommandExecutionEntity); + encryptionService.decrypt.mockReturnValueOnce(mockCreateCommandExecutionDto.command); + encryptionService.decrypt.mockReturnValueOnce(JSON.stringify([mockCommandExecutionResult])); + + const commandExecution = new CommandExecution({ + ...mockCommandExecutionPartial, + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + }); + + expect(await service.getOne(mockStandaloneDatabaseEntity.id, mockCommandExecutionEntity.id)).toEqual( + commandExecution, + ); + }); + it('should return null fields in case of decryption errors', async () => { + repository.findOne.mockResolvedValueOnce(mockCommandExecutionEntity); + encryptionService.decrypt.mockReturnValueOnce(mockCreateCommandExecutionDto.command); + encryptionService.decrypt.mockRejectedValueOnce(new KeytarDecryptionErrorException()); + + const commandExecution = new CommandExecution({ + ...mockCommandExecutionPartial, + id: mockCommandExecutionEntity.id, + createdAt: mockCommandExecutionEntity.createdAt, + result: null, + }); + + expect(await service.getOne(mockStandaloneDatabaseEntity.id, mockCommandExecutionEntity.id)).toEqual( + commandExecution, + ); + }); + it('should return not found exception', async () => { + repository.findOne.mockResolvedValueOnce(null); + + try { + await service.getOne(mockStandaloneDatabaseEntity.id, mockCommandExecutionEntity.id); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(NotFoundException); + expect(e.message).toEqual(ERROR_MESSAGES.COMMAND_EXECUTION_NOT_FOUND); + } + }); + }); + describe('delete', () => { + it('Should not return anything on delete', async () => { + repository.delete.mockResolvedValueOnce(1); + expect(await service.delete(mockStandaloneDatabaseEntity.id, mockCommandExecutionEntity.id)).toEqual( + undefined, + ); + }); + }); + describe('cleanupDatabaseHistory', () => { + it('Should should not return anything on cleanup', async () => { + mockQueryBuilderGetManyRaw.mockReturnValueOnce([ + { id: mockCommandExecutionEntity.id }, + { id: mockCommandExecutionEntity.id }, + ]); + + expect(await service.cleanupDatabaseHistory(mockStandaloneDatabaseEntity.id)).toEqual( + undefined, + ); + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/providers/command-execution.provider.ts b/redisinsight/api/src/modules/workbench/providers/command-execution.provider.ts new file mode 100644 index 0000000000..ce42f84b80 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/command-execution.provider.ts @@ -0,0 +1,236 @@ +import { Injectable, Logger, NotFoundException } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { isUndefined, filter, isNull } from 'lodash'; +import { plainToClass } from 'class-transformer'; +import { EncryptionService } from 'src/modules/core/encryption/encryption.service'; +import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity'; +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { classToClass } from 'src/utils'; +import { ShortCommandExecution } from 'src/modules/workbench/models/short-command-execution'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import config from 'src/utils/config'; + +const WORKBENCH_CONFIG = config.get('workbench'); + +@Injectable() +export class CommandExecutionProvider { + private logger = new Logger('CommandExecutionProvider'); + + constructor( + @InjectRepository(CommandExecutionEntity) + private readonly commandExecutionRepository: Repository, + private readonly encryptionService: EncryptionService, + ) {} + + /** + * Encrypt command execution and save entire entity + * Should always throw and error in case when unable to encrypt for some reason + * @param commandExecution + */ + async create(commandExecution: Partial): Promise { + const entity = plainToClass(CommandExecutionEntity, commandExecution); + + // Do not store command execution result that exceeded limitation + if (JSON.stringify(entity.result).length > WORKBENCH_CONFIG.maxResultSize) { + entity.result = JSON.stringify([ + { + status: CommandExecutionStatus.Success, + response: ERROR_MESSAGES.WORKBENCH_RESPONSE_TOO_BIG(), + }, + ]); + } + + const response = await classToClass( + CommandExecution, + { + ...await this.commandExecutionRepository.save(await this.encryptEntity(entity)), + command: commandExecution.command, + result: commandExecution.result, + nodeOptions: commandExecution.nodeOptions, + }, + ); + + // cleanup history and ignore error if any + try { + await this.cleanupDatabaseHistory(entity.databaseId); + } catch (e) { + this.logger.error('Error when trying to cleanup history after insert', e); + } + return response; + } + + /** + * Fetch only needed fiels to show in list to avoid huge decryption work + * @param databaseId + */ + async getList(databaseId: string): Promise { + this.logger.log('Getting command executions'); + const entities = await this.commandExecutionRepository + .createQueryBuilder('e') + .where({ databaseId }) + .select(['e.id', 'e.command', 'e.databaseId', 'e.createdAt', 'e.encryption', 'e.role', 'e.nodeOptions']) + .orderBy('e.createdAt', 'DESC') + .limit(WORKBENCH_CONFIG.maxItemsPerDb) + .getMany(); + + this.logger.log('Succeed to get command executions'); + + const decryptedEntities = await Promise.all( + entities.map>(async (entity) => { + try { + return await this.decryptEntity(entity); + } catch (e) { + return null; + } + }), + ); + + return filter(decryptedEntities, (entity) => !isNull(entity)) + .map((entity) => classToClass(ShortCommandExecution, entity)); + } + + /** + * Get single command execution entity, decrypt and convert to model + * + * @param databaseId + * @param id + */ + async getOne(databaseId: string, id: string): Promise { + this.logger.log('Getting command executions'); + + const entity = await this.commandExecutionRepository.findOne({ id, databaseId }); + + if (!entity) { + this.logger.error(`Command execution with id:${id} and databaseId:${databaseId} was not Found`); + throw new NotFoundException(ERROR_MESSAGES.COMMAND_EXECUTION_NOT_FOUND); + } + + this.logger.log(`Succeed to get command execution ${id}`); + + const decryptedEntity = await this.decryptEntity(entity, true); + + return classToClass(CommandExecution, decryptedEntity); + } + + /** + * Delete single item + * + * @param databaseId + * @param id + */ + async delete(databaseId: string, id: string): Promise { + this.logger.log('Delete command execution'); + + await this.commandExecutionRepository.delete({ id, databaseId }); + + this.logger.log('Command execution deleted'); + } + + /** + * Clean history for particular database to fit 30 items limitation + * @param databaseId + */ + async cleanupDatabaseHistory(databaseId: string): Promise { + // todo: investigate why delete with sub-query doesn't works + const idsToDelete = (await this.commandExecutionRepository + .createQueryBuilder() + .where({ databaseId }) + .select('id') + .orderBy('createdAt', 'DESC') + .offset(WORKBENCH_CONFIG.maxItemsPerDb) + .getRawMany()).map((item) => item.id); + + await this.commandExecutionRepository + .createQueryBuilder() + .delete() + .whereInIds(idsToDelete) + .execute(); + } + + /** + * Encrypt required command execution fields based on picked encryption strategy + * Should always throw an encryption error to determine that something wrong + * with encryption strategy + * + * @param entity + * @private + */ + private async encryptEntity(entity: CommandExecutionEntity): Promise { + let command = null; + let result = null; + let encryption = null; + + if (entity.command) { + const encryptionResult = await this.encryptionService.encrypt(entity.command); + command = encryptionResult.data; + encryption = encryptionResult.encryption; + } + + if (entity.result) { + const encryptionResult = await this.encryptionService.encrypt(entity.result); + result = encryptionResult.data; + encryption = encryptionResult.encryption; + } + + return { + ...entity, + command, + result, + encryption, + }; + } + + /** + * Decrypt required command execution fields + * This method should optionally not fail (to not block users to navigate across app + * on decryption error, for example, to be able change encryption strategy in the future) + * + * When ignoreErrors = true will return null for failed fields. + * It will cause 401 Unauthorized errors when user tries to connect to redis database + * + * @param entity + * @param ignoreErrors + * @private + */ + private async decryptEntity( + entity: CommandExecutionEntity, + ignoreErrors: boolean = false, + ): Promise { + return new CommandExecutionEntity({ + ...entity, + command: await this.decryptField(entity, 'command', ignoreErrors), + result: await this.decryptField(entity, 'result', ignoreErrors), + }); + } + + /** + * Decrypt single field if exists + * + * @param entity + * @param field + * @param ignoreErrors + * @private + */ + private async decryptField( + entity: CommandExecutionEntity, + field: string, + ignoreErrors: boolean, + ): Promise { + if (isUndefined(entity[field])) { + return undefined; + } + + try { + return await this.encryptionService.decrypt(entity[field], entity.encryption); + } catch (error) { + this.logger.error(`Unable to decrypt command execution ${entity.id} fields: ${field}`, error); + if (!ignoreErrors) { + throw error; + } + } + + return null; + } +} diff --git a/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.spec.ts b/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.spec.ts new file mode 100644 index 0000000000..5d96cfa72c --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.spec.ts @@ -0,0 +1,88 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import * as Redis from 'ioredis'; +import { + mockRedisCommandReply, + mockStandaloneDatabaseEntity, + mockWhitelistCommandsResponse, +} from 'src/__mocks__'; +import { PluginCommandsWhitelistProvider } from 'src/modules/workbench/providers/plugin-commands-whitelist.provider'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; + +const mockClient = Object.create(Redis.prototype); + +const mockRedisTool = { + getRedisClient: jest.fn(), +}; + +describe('PluginCommandsWhitelistProvider', () => { + let service; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PluginCommandsWhitelistProvider, + { + provide: RedisToolService, + useFactory: () => mockRedisTool, + }, + ], + }).compile(); + + service = await module.get(PluginCommandsWhitelistProvider); + mockRedisTool.getRedisClient.mockResolvedValue(mockClient); + mockClient.send_command = jest.fn(); + }); + + describe('getWhitelistCommands', () => { + let calculateCommandsSpy; + + beforeEach(() => { + calculateCommandsSpy = jest.spyOn(service, 'calculateWhiteListCommands'); + }); + + it('should fetch commands when no cache and return from cache when possible', async () => { + calculateCommandsSpy.mockResolvedValueOnce(mockWhitelistCommandsResponse); + + expect( + await service.getWhitelistCommands(mockStandaloneDatabaseEntity.id), + ).toEqual(mockWhitelistCommandsResponse); + expect(calculateCommandsSpy).toHaveBeenCalled(); + + calculateCommandsSpy.mockClear(); + + expect( + await service.getWhitelistCommands(mockStandaloneDatabaseEntity.id), + ).toEqual(mockWhitelistCommandsResponse); + expect(calculateCommandsSpy).not.toHaveBeenCalled(); + }); + }); + describe('calculateWhiteListCommands', () => { + it('should return 2 readonly commands', async () => { + mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); + mockClient.send_command.mockResolvedValueOnce([]); + mockClient.send_command.mockResolvedValueOnce([]); + + const result = await service.calculateWhiteListCommands(mockClient); + + expect(result).toEqual(mockWhitelistCommandsResponse); + }); + it('should return 1 readonly commands excluded by dangerous filter', async () => { + mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); + mockClient.send_command.mockResolvedValueOnce(['custom.command']); + mockClient.send_command.mockResolvedValueOnce([]); + + const result = await service.calculateWhiteListCommands(mockClient); + + expect(result).toEqual(['get']); + }); + it('should return 1 readonly commands excluded by blocking filter', async () => { + mockClient.send_command.mockResolvedValueOnce(mockRedisCommandReply); + mockClient.send_command.mockResolvedValueOnce([]); + mockClient.send_command.mockResolvedValueOnce(['custom.command']); + + const result = await service.calculateWhiteListCommands(mockClient); + + expect(result).toEqual(['get']); + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.ts b/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.ts new file mode 100644 index 0000000000..97f68b9748 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/plugin-commands-whitelist.provider.ts @@ -0,0 +1,78 @@ +import { Injectable } from '@nestjs/common'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; +import { filter, get, map } from 'lodash'; +import { pluginBlockingCommands, pluginUnsupportedCommands } from 'src/constants'; + +@Injectable() +export class PluginCommandsWhitelistProvider { + private databasesCommands: Map = new Map(); + + constructor( + private redisTool: RedisToolService, + ) {} + + /** + * Get cached commands list or determine it and cache + * @param instanceId + */ + async getWhitelistCommands( + instanceId: string, + ): Promise { + return this.databasesCommands.get(instanceId) || this.determineWhitelistCommandsForDatabase(instanceId); + } + + /** + * Get or create Workbench redis client, fetch commands and cache them + * @param instanceId + */ + async determineWhitelistCommandsForDatabase(instanceId: string): Promise { + // no need to define AppTool since it was set on RedisTool creation. todo: do not forget after refactoring + const client = await this.redisTool.getRedisClient({ instanceId }); + + const commands = await this.calculateWhiteListCommands(client); + this.databasesCommands.set(instanceId, commands); + + return commands; + } + + /** + * Get whitelisted commands available for plugins for particular database + * Commands: + * +Readonly + * -Hardcoded unsupported commands + * -Hardcoded blocking commands + * -Redis dangerous + * -Redis blocking + */ + async calculateWhiteListCommands(client: any): Promise { + let pluginWhiteListCommands = []; + try { + const availableCommands = await client.send_command('command'); + const readOnlyCommands = map(filter(availableCommands, ( + command, + ) => get(command, [2], []) + .includes('readonly')), (command) => command[0]); + + const blackListCommands = [...pluginUnsupportedCommands, ...pluginBlockingCommands]; + try { + const dangerousCommands = await client.send_command('acl', ['cat', 'dangerous']); + blackListCommands.push(...dangerousCommands); + } catch (e) { + // ignore error as acl cat available since Redis 6.0 + } + + try { + const blockingCommands = await client.send_command('acl', ['cat', 'blocking']); + blackListCommands.push(...blockingCommands); + } catch (e) { + // ignore error as acl cat available since Redis 6.0 + } + + pluginWhiteListCommands = filter(readOnlyCommands, (command) => !blackListCommands.includes(command)); + } catch (e) { + // ignore any error to not block main process of client creation + } + + return pluginWhiteListCommands.map((cmd) => cmd.toLowerCase()); + } +} diff --git a/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.spec.ts b/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.spec.ts new file mode 100644 index 0000000000..61928b45bf --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.spec.ts @@ -0,0 +1,122 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { + mockEncryptionService, + mockEncryptResult, + mockRepository, + MockType, +} from 'src/__mocks__'; +import { v4 as uuidv4 } from 'uuid'; +import { NotFoundException } from '@nestjs/common'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { PluginStateProvider } from 'src/modules/workbench/providers/plugin-state.provider'; +import { PluginState } from 'src/modules/workbench/models/plugin-state'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { EncryptionService } from 'src/modules/core/encryption/encryption.service'; +import { PluginStateEntity } from 'src/modules/workbench/entities/plugin-state.entity'; +import { Repository } from 'typeorm'; +import { KeytarDecryptionErrorException } from 'src/modules/core/encryption/exceptions'; + +const mockVisualizationId = 'pluginName_visualizationName'; +const mockCommandExecutionId = uuidv4(); +const mockState = { + some: 'object', +}; + +const mockPluginStatePartial: Partial = new PluginState({ + visualizationId: mockVisualizationId, + commandExecutionId: mockCommandExecutionId, + state: mockState, +}); + +const mockPluginState: PluginState = new PluginState({ + ...mockPluginStatePartial, + createdAt: new Date(), + updatedAt: new Date(), +}); + +const mockPluginStateEntity = new PluginStateEntity({ + ...mockPluginState, + state: mockEncryptResult.data, + encryption: 'KEYTAR', +}); + +describe('PluginStateProvider', () => { + let service: PluginStateProvider; + let repository: MockType>; + let encryptionService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PluginStateProvider, + { + provide: getRepositoryToken(PluginStateEntity), + useFactory: mockRepository, + }, + { + provide: EncryptionService, + useFactory: mockEncryptionService, + }, + ], + }).compile(); + + service = module.get(PluginStateProvider); + repository = module.get(getRepositoryToken(PluginStateEntity)); + encryptionService = module.get(EncryptionService); + }); + + describe('upsert', () => { + it('should process new entity', async () => { + repository.save.mockReturnValueOnce(mockPluginStateEntity); + encryptionService.encrypt.mockReturnValue(mockEncryptResult); + + expect(await service.upsert(mockPluginStatePartial)).toEqual(undefined); + }); + it('should throw not found error ON SQL constraint error', async () => { + const constraintError: any = new Error('FOREIGN_KEY error'); + constraintError.code = 'SQLITE_CONSTRAINT'; + + repository.save.mockRejectedValueOnce(constraintError); + encryptionService.encrypt.mockReturnValue(mockEncryptResult); + + try { + await service.upsert(mockPluginStatePartial); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(NotFoundException); + expect(e.message).toEqual(ERROR_MESSAGES.COMMAND_EXECUTION_NOT_FOUND); + } + }); + }); + describe('getOne', () => { + it('should return decrypted and transformed state', async () => { + repository.findOne.mockResolvedValueOnce(mockPluginStateEntity); + encryptionService.decrypt.mockReturnValueOnce(JSON.stringify(mockPluginState.state)); + + expect(await service.getOne(mockVisualizationId, mockCommandExecutionId)).toEqual(mockPluginState); + }); + it('should return null fields in case of decryption errors', async () => { + repository.findOne.mockResolvedValueOnce(mockPluginStateEntity); + encryptionService.decrypt.mockRejectedValueOnce(new KeytarDecryptionErrorException()); + + const result = await service.getOne(mockVisualizationId, mockCommandExecutionId); + + expect(result).toBeInstanceOf(PluginState); + expect(result).toEqual({ + ...mockPluginState, + state: null, + }); + }); + it('should return not found exception', async () => { + repository.findOne.mockResolvedValueOnce(null); + + try { + await service.getOne(mockVisualizationId, mockCommandExecutionId); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(NotFoundException); + expect(e.message).toEqual(ERROR_MESSAGES.PLUGIN_STATE_NOT_FOUND); + } + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.ts b/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.ts new file mode 100644 index 0000000000..6b74868fcc --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/plugin-state.provider.ts @@ -0,0 +1,142 @@ +import { Injectable, Logger, NotFoundException } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { isUndefined } from 'lodash'; +import { plainToClass } from 'class-transformer'; +import { EncryptionService } from 'src/modules/core/encryption/encryption.service'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { classToClass } from 'src/utils'; +import { PluginStateEntity } from 'src/modules/workbench/entities/plugin-state.entity'; +import { PluginState } from 'src/modules/workbench/models/plugin-state'; + +@Injectable() +export class PluginStateProvider { + private logger = new Logger('PluginStateProvider'); + + constructor( + @InjectRepository(PluginStateEntity) + private readonly repository: Repository, + private readonly encryptionService: EncryptionService, + ) {} + + /** + * Encrypt command execution and save entire entity + * Should always throw and error in case when unable to encrypt for some reason + * @param pluginState + */ + async upsert(pluginState: Partial): Promise { + const entity = plainToClass(PluginStateEntity, pluginState); + try { + await this.repository.save(await this.encryptEntity(entity)); + } catch (e) { + if (e.code === 'SQLITE_CONSTRAINT') { + throw new NotFoundException(ERROR_MESSAGES.COMMAND_EXECUTION_NOT_FOUND); + } + + throw e; + } + } + + /** + * Get single command execution entity, decrypt and convert to model + * + * @param visualizationId + * @param commandExecutionId + */ + async getOne(visualizationId: string, commandExecutionId: string): Promise { + this.logger.log('Getting plugin state'); + + const entity = await this.repository.findOne({ visualizationId, commandExecutionId }); + + if (!entity) { + this.logger.error(`Plugin state ${commandExecutionId}:${visualizationId} was not Found`); + throw new NotFoundException(ERROR_MESSAGES.PLUGIN_STATE_NOT_FOUND); + } + + this.logger.log(`Succeed to get plugin state ${commandExecutionId}:${visualizationId}`); + + const decryptedEntity = await this.decryptEntity(entity, true); + + return classToClass(PluginState, decryptedEntity); + } + + /** + * Encrypt required command execution fields based on picked encryption strategy + * Should always throw an encryption error to determine that something wrong + * with encryption strategy + * + * @param entity + * @private + */ + private async encryptEntity(entity: PluginStateEntity): Promise { + let state = null; + let encryption = null; + + if (entity.state) { + const encryptionResult = await this.encryptionService.encrypt(entity.state); + state = encryptionResult.data; + encryption = encryptionResult.encryption; + } + + return { + ...entity, + state, + encryption, + }; + } + + /** + * Decrypt required command execution fields + * This method should optionally not fail (to not block users to navigate across app + * on decryption error, for example, to be able change encryption strategy in the future) + * + * When ignoreErrors = true will return null for failed fields. + * It will cause 401 Unauthorized errors when user tries to connect to redis database + * + * @param entity + * @param ignoreErrors + * @private + */ + private async decryptEntity( + entity: PluginStateEntity, + ignoreErrors: boolean = false, + ): Promise { + return new PluginStateEntity({ + ...entity, + state: await this.decryptField(entity, 'state', ignoreErrors), + }); + } + + /** + * Decrypt single field if exists + * + * @param entity + * @param field + * @param ignoreErrors + * @private + */ + private async decryptField( + entity: PluginStateEntity, + field: string, + ignoreErrors: boolean, + ): Promise { + if (isUndefined(entity[field])) { + return undefined; + } + + try { + return await this.encryptionService.decrypt(entity[field], entity.encryption); + } catch (error) { + this.logger.error( + `Unable to decrypt state ${entity.commandExecutionId}:${entity.visualizationId} fields: ${field}`, + error, + ); + + if (!ignoreErrors) { + throw error; + } + } + + return null; + } +} diff --git a/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.spec.ts b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.spec.ts new file mode 100644 index 0000000000..a5eb8fc0fc --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.spec.ts @@ -0,0 +1,276 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { mockRedisMovedError, mockStandaloneDatabaseEntity } from 'src/__mocks__'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { ClusterNodeRole, CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { BadRequestException, InternalServerErrorException, ServiceUnavailableException } from '@nestjs/common'; +import { + CliCommandNotSupportedError, + ClusterNodeNotFoundError, + WrongDatabaseTypeError, +} from 'src/modules/cli/constants/errors'; +import { ICliExecResultFromNode, RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; + +const MOCK_ERROR_MESSAGE = 'Some error'; + +const mockClientOptions: IFindRedisClientInstanceByOptions = { + instanceId: mockStandaloneDatabaseEntity.id, +}; + +const mockCliTool = () => ({ + execCommand: jest.fn(), + execCommandForNodes: jest.fn(), + execCommandForNode: jest.fn(), +}); + +const mockNodeEndpoint = { + host: '127.0.0.1', + port: 6379, +}; + +const mockCliNodeResponse: ICliExecResultFromNode = { + ...mockNodeEndpoint, + response: 'OK', + status: CommandExecutionStatus.Success, +}; + +const mockCreateCommandExecutionDto: CreateCommandExecutionDto = { + command: 'set foo bar', + nodeOptions: { + ...mockNodeEndpoint, + enableRedirection: true, + }, + role: ClusterNodeRole.All, +}; + +const mockCommandExecutionResult: CommandExecutionResult = { + status: mockCliNodeResponse.status, + response: mockCliNodeResponse.response, + node: { + ...mockNodeEndpoint, + }, +}; + +describe('WorkbenchCommandsExecutor', () => { + let service: WorkbenchCommandsExecutor; + let cliTool; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + WorkbenchCommandsExecutor, + { + provide: RedisToolService, + useFactory: mockCliTool, + }, + ], + }).compile(); + + service = module.get(WorkbenchCommandsExecutor); + cliTool = module.get(RedisToolService); + }); + + describe('sendCommand', () => { + describe('sendCommandForStandalone', () => { + it('should successfully send command for standalone', async () => { + cliTool.execCommand.mockResolvedValueOnce(mockCommandExecutionResult.response); + + const result = await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + }); + + expect(result).toEqual([{ + response: mockCommandExecutionResult.response, + status: mockCommandExecutionResult.status, + }]); + }); + it('should return fail status in case of unsupported command error', async () => { + cliTool.execCommand.mockRejectedValueOnce(new CliCommandNotSupportedError(MOCK_ERROR_MESSAGE)); + + const result = await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + }); + + expect(result).toEqual([{ + response: MOCK_ERROR_MESSAGE, + status: CommandExecutionStatus.Fail, + }]); + }); + it('should return fail status when replyError happened', async () => { + const replyError: Error = { + message: MOCK_ERROR_MESSAGE, + name: 'ReplyError', + }; + + cliTool.execCommand.mockRejectedValueOnce(replyError); + + const result = await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + }); + + expect(result).toEqual([{ + response: MOCK_ERROR_MESSAGE, + status: CommandExecutionStatus.Fail, + }]); + }); + it('should throw an error when unexpected error happened', async () => { + cliTool.execCommand.mockRejectedValueOnce(new ServiceUnavailableException(MOCK_ERROR_MESSAGE)); + + try { + await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + }); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + expect(e.message).toEqual(MOCK_ERROR_MESSAGE); + } + }); + }); + describe('sendCommandForSingleNode', () => { + it('should successfully send command for standalone', async () => { + cliTool.execCommandForNode.mockResolvedValueOnce(mockCliNodeResponse); + + const result = await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + + expect(result).toEqual([{ + ...mockCommandExecutionResult, + }]); + }); + it('should return failed status when redirection disabled and MOVED response received', async () => { + cliTool.execCommandForNode.mockResolvedValueOnce({ + ...mockCliNodeResponse, + error: mockRedisMovedError, + }); + + const result = await service.sendCommand(mockClientOptions, { + ...mockCreateCommandExecutionDto, + nodeOptions: { + ...mockCreateCommandExecutionDto.nodeOptions, + enableRedirection: false, + }, + }); + + expect(result).toEqual([{ + ...mockCommandExecutionResult, + }]); + }); + it('should return success status when redirection enabled and MOVED response received', async () => { + cliTool.execCommandForNode.mockResolvedValueOnce({ + ...mockCliNodeResponse, + error: mockRedisMovedError, + }); + cliTool.execCommandForNode.mockResolvedValueOnce(mockCliNodeResponse); + + const result = await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + + expect(result).toEqual([{ + ...mockCommandExecutionResult, + node: { + ...mockCommandExecutionResult.node, + slot: 7008, + }, + }]); + }); + it('should return fail status when command is not supported', async () => { + cliTool.execCommandForNode.mockRejectedValueOnce(new CliCommandNotSupportedError(MOCK_ERROR_MESSAGE)); + + const result = await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + + expect(result).toEqual([{ + response: MOCK_ERROR_MESSAGE, + status: CommandExecutionStatus.Fail, + }]); + }); + it('should throw BadRequest when ClusterNodeNotFoundError error received', async () => { + cliTool.execCommandForNode.mockRejectedValueOnce(new ClusterNodeNotFoundError(MOCK_ERROR_MESSAGE)); + + try { + await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + expect(e.message).toEqual(MOCK_ERROR_MESSAGE); + } + }); + it('should throw an error when unexpected error happened', async () => { + cliTool.execCommandForNode.mockRejectedValueOnce(new ServiceUnavailableException(MOCK_ERROR_MESSAGE)); + + try { + await service.sendCommand(mockClientOptions, mockCreateCommandExecutionDto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + expect(e.message).toEqual(MOCK_ERROR_MESSAGE); + } + }); + }); + describe('sendCommandForNodes', () => { + it('should successfully send commands for nodes by role', async () => { + cliTool.execCommandForNodes.mockResolvedValueOnce([ + mockCliNodeResponse, + { + ...mockCliNodeResponse, + status: CommandExecutionStatus.Fail, + }, + ]); + + const result = await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + role: mockCreateCommandExecutionDto.role, + }); + + expect(result).toEqual([ + mockCommandExecutionResult, + { + ...mockCommandExecutionResult, + status: CommandExecutionStatus.Fail, + }, + ]); + }); + it('should return fail status when command is not supported', async () => { + cliTool.execCommandForNodes.mockRejectedValueOnce(new CliCommandNotSupportedError(MOCK_ERROR_MESSAGE)); + + const result = await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + role: mockCreateCommandExecutionDto.role, + }); + + expect(result).toEqual([{ + response: MOCK_ERROR_MESSAGE, + status: CommandExecutionStatus.Fail, + }]); + }); + it('should throw BadRequest when WrongDatabaseTypeError error received', async () => { + cliTool.execCommandForNodes.mockRejectedValueOnce(new WrongDatabaseTypeError(MOCK_ERROR_MESSAGE)); + + try { + await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + role: mockCreateCommandExecutionDto.role, + }); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + expect(e.message).toEqual(MOCK_ERROR_MESSAGE); + } + }); + it('should throw an error when unexpected error happened', async () => { + cliTool.execCommandForNodes.mockRejectedValueOnce(new ServiceUnavailableException(MOCK_ERROR_MESSAGE)); + + try { + await service.sendCommand(mockClientOptions, { + command: mockCreateCommandExecutionDto.command, + role: mockCreateCommandExecutionDto.role, + }); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + expect(e.message).toEqual(MOCK_ERROR_MESSAGE); + } + }); + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.ts b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.ts new file mode 100644 index 0000000000..a9d744516d --- /dev/null +++ b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.ts @@ -0,0 +1,173 @@ +import { + BadRequestException, Injectable, InternalServerErrorException, Logger, +} from '@nestjs/common'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { + ClusterNodeRole, ClusterSingleNodeOptions, + CommandExecutionStatus, +} from 'src/modules/cli/dto/cli.dto'; +import { checkRedirectionError, parseRedirectionError, splitCliCommandLine } from 'src/utils/cli-helper'; +import { + CliCommandNotSupportedError, + CliParsingError, + ClusterNodeNotFoundError, + WrongDatabaseTypeError, +} from 'src/modules/cli/constants/errors'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; + +@Injectable() +export class WorkbenchCommandsExecutor { + private logger = new Logger('WorkbenchCommandsExecutor'); + + constructor(private redisTool: RedisToolService) {} + + public async sendCommand( + clientOptions: IFindRedisClientInstanceByOptions, + dto: CreateCommandExecutionDto, + ): Promise { + const { command, role, nodeOptions } = dto; + + if (nodeOptions) { + const result = await this.sendCommandForSingleNode( + clientOptions, + command, + role, + nodeOptions, + ); + + return [result]; + } + + if (role) { + return this.sendCommandForNodes(clientOptions, command, role); + } + + return [await this.sendCommandForStandalone(clientOptions, dto)]; + } + + private async sendCommandForStandalone( + clientOptions: IFindRedisClientInstanceByOptions, + dto: CreateCommandExecutionDto, + ): Promise { + this.logger.log('Executing workbench command.'); + const { command: commandLine } = dto; + + try { + const [command, ...args] = splitCliCommandLine(commandLine); + const response = await this.redisTool.execCommand(clientOptions, command, args, 'utf-8'); + this.logger.log('Succeed to execute workbench command.'); + return { + response, + status: CommandExecutionStatus.Success, + }; + } catch (error) { + this.logger.error('Failed to execute workbench command.', error); + + if ( + error instanceof CliParsingError + || error instanceof CliCommandNotSupportedError + || error.name === 'ReplyError' + ) { + return { response: error.message, status: CommandExecutionStatus.Fail }; + } + + throw new InternalServerErrorException(error.message); + } + } + + private async sendCommandForSingleNode( + clientOptions: IFindRedisClientInstanceByOptions, + commandLine: string, + role: ClusterNodeRole = ClusterNodeRole.All, + nodeOptions: ClusterSingleNodeOptions, + ): Promise { + this.logger.log(`Executing redis.cluster CLI command for single node ${JSON.stringify(nodeOptions)}`); + try { + const [command, ...args] = splitCliCommandLine(commandLine); + + const nodeAddress = `${nodeOptions.host}:${nodeOptions.port}`; + let result = await this.redisTool.execCommandForNode( + clientOptions, + command, + args, + role, + nodeAddress, + 'utf-8', + ); + if (result.error && checkRedirectionError(result.error) && nodeOptions.enableRedirection) { + const { slot, address } = parseRedirectionError(result.error); + result = await this.redisTool.execCommandForNode( + clientOptions, + command, + args, + role, + address, + 'utf-8', + ); + result.slot = parseInt(slot, 10); + } + + const { + host, port, error, slot, ...rest + } = result; + return { ...rest, node: { host, port, slot } }; + } catch (error) { + this.logger.error('Failed to execute redis.cluster CLI command.', error); + + if (error instanceof CliParsingError || error instanceof CliCommandNotSupportedError) { + return { response: error.message, status: CommandExecutionStatus.Fail }; + } + + if (error instanceof WrongDatabaseTypeError || error instanceof ClusterNodeNotFoundError) { + throw new BadRequestException(error.message); + } + + throw new InternalServerErrorException(error.message); + } + } + + private async sendCommandForNodes( + clientOptions: IFindRedisClientInstanceByOptions, + commandLine: string, + role: ClusterNodeRole, + ): Promise { + this.logger.log(`Executing redis.cluster CLI command for [${role}] nodes.`); + try { + const [command, ...args] = splitCliCommandLine(commandLine); + + const result = await this.redisTool.execCommandForNodes( + clientOptions, + command, + args, + role, + 'utf-8', + ); + + return result.map((nodeExecReply) => { + const { + response, status, host, port, + } = nodeExecReply; + return { + response, + status, + node: { host, port }, + }; + }); + } catch (error) { + this.logger.error('Failed to execute redis.cluster CLI command.', error); + + if (error instanceof CliParsingError || error instanceof CliCommandNotSupportedError) { + return [ + { response: error.message, status: CommandExecutionStatus.Fail }, + ]; + } + + if (error instanceof WrongDatabaseTypeError) { + throw new BadRequestException(error.message); + } + throw new InternalServerErrorException(error.message); + } + } +} diff --git a/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.spec.ts b/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.spec.ts new file mode 100644 index 0000000000..8839fb1ea3 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.spec.ts @@ -0,0 +1,9 @@ +import { getUnsupportedCommands } from './getUnsupportedCommands'; + +describe('workbench unsupported commands', () => { + it('should return correct list', () => { + const expectedResult = ['monitor', 'subscribe', 'psubscribe', 'sync', 'psync', 'script debug', 'select']; + + expect(getUnsupportedCommands()).toEqual(expectedResult); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.ts b/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.ts new file mode 100644 index 0000000000..bdd082a51a --- /dev/null +++ b/redisinsight/api/src/modules/workbench/utils/getUnsupportedCommands.ts @@ -0,0 +1,18 @@ +import config from 'src/utils/config'; + +const WORKBENCH_CONFIG = config.get('workbench'); + +export enum WorkbenchToolUnsupportedCommands { + Monitor = 'monitor', + Subscribe = 'subscribe', + PSubscribe = 'psubscribe', + Sync = 'sync', + PSync = 'psync', + ScriptDebug = 'script debug', + Select = 'select', +} + +export const getUnsupportedCommands = (): string[] => [ + ...Object.values(WorkbenchToolUnsupportedCommands), + ...WORKBENCH_CONFIG.unsupportedCommands, +]; diff --git a/redisinsight/api/src/modules/workbench/workbench.controller.ts b/redisinsight/api/src/modules/workbench/workbench.controller.ts new file mode 100644 index 0000000000..1e7e4c1ec9 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/workbench.controller.ts @@ -0,0 +1,97 @@ +import { + Body, ClassSerializerInterceptor, Controller, Delete, Get, Param, Post, UseInterceptors, UsePipes, ValidationPipe, +} from '@nestjs/common'; +import { ApiTags } from '@nestjs/swagger'; +import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator'; +import { ApiRedisParams } from 'src/decorators/api-redis-params.decorator'; +import { WorkbenchService } from 'src/modules/workbench/workbench.service'; +import { AppTool } from 'src/models'; +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import {ShortCommandExecution} from "src/modules/workbench/models/short-command-execution"; + +@ApiTags('Workbench') +@UsePipes(new ValidationPipe({ transform: true })) +@Controller('workbench') +export class WorkbenchController { + constructor(private service: WorkbenchService) {} + + @ApiEndpoint({ + description: 'Send Redis Command from the Workbench', + statusCode: 200, + responses: [ + { + status: 200, + type: CommandExecution, + }, + ], + }) + @Post('/command-executions') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async sendCommand( + @Param('dbInstance') dbInstance: string, + @Body() dto: CreateCommandExecutionDto, + ): Promise { + return this.service.createCommandExecution( + { + instanceId: dbInstance, + tool: AppTool.Workbench, + }, + dto, + ); + } + + @ApiEndpoint({ + description: 'List of command executions', + statusCode: 200, + responses: [ + { + status: 200, + type: ShortCommandExecution, + isArray: true, + }, + ], + }) + @Get('/command-executions') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async listCommandExecutions( + @Param('dbInstance') databaseId: string, + ): Promise { + return this.service.listCommandExecutions(databaseId); + } + + @ApiEndpoint({ + description: 'Get command execution details', + statusCode: 200, + responses: [ + { + status: 200, + type: CommandExecution, + }, + ], + }) + @Get('/command-executions/:id') + @UseInterceptors(ClassSerializerInterceptor) + @ApiRedisParams() + async getCommandExecution( + @Param('dbInstance') databaseId: string, + @Param('id') id: string, + ): Promise { + return this.service.getCommandExecution(databaseId, id); + } + + @ApiEndpoint({ + description: 'Delete command execution', + statusCode: 200, + }) + @Delete('/command-executions/:id') + @ApiRedisParams() + async deleteCommandExecution( + @Param('dbInstance') databaseId: string, + @Param('id') id: string, + ): Promise { + return this.service.deleteCommandExecution(databaseId, id); + } +} diff --git a/redisinsight/api/src/modules/workbench/workbench.module.ts b/redisinsight/api/src/modules/workbench/workbench.module.ts new file mode 100644 index 0000000000..e37e0029ef --- /dev/null +++ b/redisinsight/api/src/modules/workbench/workbench.module.ts @@ -0,0 +1,54 @@ +import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common'; +import { WorkbenchController } from 'src/modules/workbench/workbench.controller'; +import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware'; +import { RouterModule } from 'nest-router'; +import { SharedModule } from 'src/modules/shared/shared.module'; +import { WorkbenchService } from 'src/modules/workbench/workbench.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { CommandExecutionProvider } from 'src/modules/workbench/providers/command-execution.provider'; +import { CoreModule } from 'src/modules/core/core.module'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { CommandExecutionEntity } from 'src/modules/workbench/entities/command-execution.entity'; +import { RedisToolService } from 'src/modules/shared/services/base/redis-tool.service'; +import { RedisToolFactory } from 'src/modules/shared/services/base/redis-tool.factory'; +import { AppTool } from 'src/models'; +import { PluginsService } from 'src/modules/workbench/plugins.service'; +import { PluginCommandsWhitelistProvider } from 'src/modules/workbench/providers/plugin-commands-whitelist.provider'; +import { PluginsController } from 'src/modules/workbench/plugins.controller'; +import { PluginStateProvider } from 'src/modules/workbench/providers/plugin-state.provider'; +import { PluginStateEntity } from 'src/modules/workbench/entities/plugin-state.entity'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + CommandExecutionEntity, + PluginStateEntity, + ]), + CoreModule, + SharedModule, + ], + controllers: [ + WorkbenchController, + PluginsController, + ], + providers: [ + WorkbenchService, + WorkbenchCommandsExecutor, + CommandExecutionProvider, + { + provide: RedisToolService, + useFactory: (redisToolFactory: RedisToolFactory) => redisToolFactory.createRedisTool(AppTool.Workbench), + inject: [RedisToolFactory], + }, + PluginsService, + PluginCommandsWhitelistProvider, + PluginStateProvider, + ], +}) +export class WorkbenchModule implements NestModule { + configure(consumer: MiddlewareConsumer): any { + consumer + .apply(RedisConnectionMiddleware) + .forRoutes(RouterModule.resolvePath(WorkbenchController)); + } +} diff --git a/redisinsight/api/src/modules/workbench/workbench.service.spec.ts b/redisinsight/api/src/modules/workbench/workbench.service.spec.ts new file mode 100644 index 0000000000..433c717300 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/workbench.service.spec.ts @@ -0,0 +1,193 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { v4 as uuidv4 } from 'uuid'; +import { mockStandaloneDatabaseEntity } from 'src/__mocks__'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { WorkbenchService } from 'src/modules/workbench/workbench.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { CommandExecutionProvider } from 'src/modules/workbench/providers/command-execution.provider'; +import { ClusterNodeRole, CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { BadRequestException, InternalServerErrorException } from '@nestjs/common'; +import ERROR_MESSAGES from 'src/constants/error-messages'; + +const mockClientOptions: IFindRedisClientInstanceByOptions = { + instanceId: mockStandaloneDatabaseEntity.id, +}; + +const mockCreateCommandExecutionDto: CreateCommandExecutionDto = { + command: 'set foo bar', + nodeOptions: { + host: '127.0.0.1', + port: 7002, + enableRedirection: true, + }, + role: ClusterNodeRole.All, +}; + +const mockCommandExecutionResults: CommandExecutionResult[] = [ + new CommandExecutionResult({ + status: CommandExecutionStatus.Success, + response: 'OK', + node: { + host: '127.0.0.1', + port: 6379, + slot: 0, + }, + }), +]; +const mockCommandExecution: CommandExecution = new CommandExecution({ + ...mockCreateCommandExecutionDto, + databaseId: mockStandaloneDatabaseEntity.id, + id: uuidv4(), + createdAt: new Date(), + result: mockCommandExecutionResults, +}); + +const mockCommandExecutionProvider = () => ({ + create: jest.fn(), + getList: jest.fn(), + getOne: jest.fn(), + delete: jest.fn(), +}); + +describe('WorkbenchService', () => { + let service: WorkbenchService; + let workbenchCommandsExecutor; + let commandExecutionProvider; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + WorkbenchService, + { + provide: WorkbenchCommandsExecutor, + useFactory: () => ({ + sendCommand: jest.fn(), + }), + }, + { + provide: CommandExecutionProvider, + useFactory: mockCommandExecutionProvider, + }, + ], + }).compile(); + + service = module.get(WorkbenchService); + workbenchCommandsExecutor = module.get(WorkbenchCommandsExecutor); + commandExecutionProvider = module.get(CommandExecutionProvider); + }); + + describe('createCommandExecution', () => { + it('should successfully execute command and save it', async () => { + workbenchCommandsExecutor.sendCommand.mockResolvedValueOnce(mockCommandExecutionResults); + commandExecutionProvider.create.mockResolvedValueOnce(mockCommandExecution); + + const result = await service.createCommandExecution(mockClientOptions, mockCreateCommandExecutionDto); + + expect(result).toBeInstanceOf(CommandExecution); + expect(result).toEqual(mockCommandExecution); + }); + it('should save result as unsupported command message', async () => { + workbenchCommandsExecutor.sendCommand.mockResolvedValueOnce(mockCommandExecutionResults); + + const dto = { + ...mockCommandExecutionResults, + command: 'subscribe', + }; + + await service.createCommandExecution(mockClientOptions, dto); + + expect(commandExecutionProvider.create).toHaveBeenCalledWith({ + ...dto, + databaseId: mockClientOptions.instanceId, + result: [ + { + response: ERROR_MESSAGES.WORKBENCH_COMMAND_NOT_SUPPORTED(dto.command.toUpperCase()), + status: CommandExecutionStatus.Fail, + }, + ], + }); + }); + it('should throw an error when command execution failed', async () => { + workbenchCommandsExecutor.sendCommand.mockRejectedValueOnce(new BadRequestException('error')); + + const dto = { + ...mockCommandExecutionResults, + command: 'scan 0', + }; + + try { + await service.createCommandExecution(mockClientOptions, dto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(BadRequestException); + } + }); + it('should throw an error from command execution provider (create)', async () => { + workbenchCommandsExecutor.sendCommand.mockResolvedValueOnce(mockCommandExecutionResults); + commandExecutionProvider.create.mockRejectedValueOnce(new InternalServerErrorException('db error')); + + const dto = { + ...mockCommandExecutionResults, + command: 'scan 0', + }; + + try { + await service.createCommandExecution(mockClientOptions, dto); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + } + }); + }); + + describe('listCommandExecutions', () => { + it('should return list of command executions', async () => { + commandExecutionProvider.getList.mockResolvedValueOnce([mockCommandExecution, mockCommandExecution]); + + const result = await service.listCommandExecutions(mockClientOptions.instanceId); + + expect(result).toEqual([mockCommandExecution, mockCommandExecution]); + }); + it('should throw an error from command execution provider (getList)', async () => { + commandExecutionProvider.getList.mockRejectedValueOnce(new InternalServerErrorException()); + + try { + await service.listCommandExecutions(mockClientOptions.instanceId); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + } + }); + }); + describe('getCommandExecution', () => { + it('should return full command executions', async () => { + commandExecutionProvider.getOne.mockResolvedValueOnce(mockCommandExecution); + + const result = await service.getCommandExecution(mockClientOptions.instanceId, mockCommandExecution.id); + + expect(result).toEqual(mockCommandExecution); + }); + it('should throw an error from command execution provider (getOne)', async () => { + commandExecutionProvider.getOne.mockRejectedValueOnce(new InternalServerErrorException()); + + try { + await service.getCommandExecution(mockClientOptions.instanceId, mockCommandExecution.id); + fail(); + } catch (e) { + expect(e).toBeInstanceOf(InternalServerErrorException); + } + }); + }); + describe('deleteCommandExecution', () => { + it('should not return anything on delete', async () => { + commandExecutionProvider.delete.mockResolvedValueOnce('some response'); + + const result = await service.deleteCommandExecution(mockClientOptions.instanceId, mockCommandExecution.id); + + expect(result).toEqual(undefined); + }); + }); +}); diff --git a/redisinsight/api/src/modules/workbench/workbench.service.ts b/redisinsight/api/src/modules/workbench/workbench.service.ts new file mode 100644 index 0000000000..2ad3064c92 --- /dev/null +++ b/redisinsight/api/src/modules/workbench/workbench.service.ts @@ -0,0 +1,91 @@ +import { Injectable } from '@nestjs/common'; +import { IFindRedisClientInstanceByOptions } from 'src/modules/core/services/redis/redis.service'; +import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor'; +import { CommandExecutionProvider } from 'src/modules/workbench/providers/command-execution.provider'; +import { CommandExecution } from 'src/modules/workbench/models/command-execution'; +import { CreateCommandExecutionDto } from 'src/modules/workbench/dto/create-command-execution.dto'; +import { getBlockingCommands, multilineCommandToOneLine } from 'src/utils/cli-helper'; +import ERROR_MESSAGES from 'src/constants/error-messages'; +import { ShortCommandExecution } from 'src/modules/workbench/models/short-command-execution'; +import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto'; +import { getUnsupportedCommands } from './utils/getUnsupportedCommands'; + +@Injectable() +export class WorkbenchService { + constructor( + private commandsExecutor: WorkbenchCommandsExecutor, + private commandExecutionProvider: CommandExecutionProvider, + ) {} + + /** + * Send redis command from workbench and save history + * + * @param clientOptions + * @param dto + */ + async createCommandExecution( + clientOptions: IFindRedisClientInstanceByOptions, + dto: CreateCommandExecutionDto, + ): Promise { + const commandExecution: Partial = { + ...dto, + databaseId: clientOptions.instanceId, + }; + + const command = multilineCommandToOneLine(dto.command); + const deprecatedCommand = this.findCommandInBlackList(command); + if (deprecatedCommand) { + commandExecution.result = [ + { + response: ERROR_MESSAGES.WORKBENCH_COMMAND_NOT_SUPPORTED(deprecatedCommand.toUpperCase()), + status: CommandExecutionStatus.Fail, + }, + ]; + } else { + commandExecution.result = await this.commandsExecutor.sendCommand(clientOptions, { ...dto, command }); + } + + return this.commandExecutionProvider.create(commandExecution); + } + + /** + * Get list command execution history per instance (last 30 items) + * + * @param databaseId + */ + async listCommandExecutions(databaseId: string): Promise { + return this.commandExecutionProvider.getList(databaseId); + } + + /** + * Get command execution details + * + * @param databaseId + * @param id + */ + async getCommandExecution(databaseId: string, id: string): Promise { + return this.commandExecutionProvider.getOne(databaseId, id); + } + + /** + * Delete command execution by id and databaseId + * + * @param databaseId + * @param id + */ + async deleteCommandExecution(databaseId: string, id: string): Promise { + await this.commandExecutionProvider.delete(databaseId, id); + } + + /** + * Check if workbench allows such command + * @param commandLine + * @private + */ + private findCommandInBlackList(commandLine: string): string { + const targetCommand = commandLine.toLowerCase(); + return getUnsupportedCommands() + .concat(getBlockingCommands()) + .find((command) => targetCommand.startsWith(command)); + } +} diff --git a/redisinsight/api/src/utils/analytics-helper.ts b/redisinsight/api/src/utils/analytics-helper.ts index 96e43c4c30..e705dd5e49 100644 --- a/redisinsight/api/src/utils/analytics-helper.ts +++ b/redisinsight/api/src/utils/analytics-helper.ts @@ -1,5 +1,6 @@ import * as jsonpath from 'jsonpath'; import { isNil } from 'lodash'; +import { RedisModuleDto } from 'src/modules/instances/dto/database-instance.dto'; export const TOTAL_KEYS_BREAKPOINTS = [ 500000, diff --git a/redisinsight/api/src/utils/class-transformer.ts b/redisinsight/api/src/utils/class-transformer.ts new file mode 100644 index 0000000000..66dce8b731 --- /dev/null +++ b/redisinsight/api/src/utils/class-transformer.ts @@ -0,0 +1,18 @@ +import { ClassType } from 'class-transformer/ClassTransformer'; +import { ClassTransformOptions } from 'class-transformer/ClassTransformOptions'; +import { classToPlain, plainToClass } from 'class-transformer'; + +export function classToClass( + targetClass: ClassType, + classInstance: V, + options?: ClassTransformOptions, +): T { + const defaultOptions = { + excludeExtraneousValues: true, + }; + + return plainToClass(targetClass, classToPlain(classInstance), { + ...defaultOptions, + ...options, + }); +} diff --git a/redisinsight/api/src/utils/cli-helper.ts b/redisinsight/api/src/utils/cli-helper.ts index dc81f43304..7c11456daa 100644 --- a/redisinsight/api/src/utils/cli-helper.ts +++ b/redisinsight/api/src/utils/cli-helper.ts @@ -1,21 +1,12 @@ -import { take } from 'lodash'; +import { take, isEmpty } from 'lodash'; import config from 'src/utils/config'; import ERROR_MESSAGES from 'src/constants/error-messages'; import { CliParsingError, RedirectionParsingError } from 'src/modules/cli/constants/errors'; import { ReplyError } from 'src/models'; import { IRedirectionInfo } from 'src/modules/cli/services/cli-business/output-formatter/output-formatter.interface'; -const REDIS_CLI_CONFIG = config.get('redis_cli'); const LOGGER_CONFIG = config.get('logger'); - -export enum CliToolUnsupportedCommands { - Monitor = 'monitor', - Subscribe = 'subscribe', - PSubscribe = 'psubscribe', - Sync = 'sync', - PSync = 'psync', - ScriptDebug = 'script debug', -} +const BLANK_LINE_REGEX = /^\s*\n/gm; export enum CliToolBlockingCommands { BLPop = 'blpop', @@ -72,6 +63,7 @@ function getSpecChar(str: string): string { } // todo: review/rewrite this function. Pay attention on handling data inside '' vs "" +// todo: rethink implementation. set key {value} where {value} is string ~500KB take ~15s export const splitCliCommandLine = (line: string): string[] => { // Splits a command line into a list of arguments. // Ported from sdssplitargs() function in sds.c from Redis source code. @@ -164,11 +156,6 @@ export const splitCliCommandLine = (line: string): string[] => { return args; }; -export const getUnsupportedCommands = (): string[] => [ - ...Object.values(CliToolUnsupportedCommands), - ...REDIS_CLI_CONFIG.unsupportedCommands, -]; - export const getBlockingCommands = (): string[] => Object.values(CliToolBlockingCommands); export function decimalToHexString(d: number, padding: number = 2): string { @@ -227,3 +214,8 @@ export function getRedisPipelineSummary( } return result; } + +export const multilineCommandToOneLine = (text: string = '') => text + .split(/(\r\n|\n|\r)+\s+/gm) + .filter((line: string) => !(BLANK_LINE_REGEX.test(line) || isEmpty(line))) + .join(' '); diff --git a/redisinsight/api/src/utils/config.ts b/redisinsight/api/src/utils/config.ts index 59ecb70388..b070181e3a 100644 --- a/redisinsight/api/src/utils/config.ts +++ b/redisinsight/api/src/utils/config.ts @@ -2,6 +2,7 @@ import { merge, cloneDeep } from 'lodash'; import defaultConfig from '../../config/default'; import development from '../../config/development'; import staging from '../../config/staging'; +import test from '../../config/test'; import production from '../../config/production'; const config = cloneDeep(defaultConfig); @@ -14,6 +15,9 @@ switch (process.env.NODE_ENV) { case 'production': envConfig = production; break; + case 'test': + envConfig = test; + break; default: envConfig = development; break; diff --git a/redisinsight/api/src/utils/index.ts b/redisinsight/api/src/utils/index.ts index 4ad3cef41a..eb92449b3a 100644 --- a/redisinsight/api/src/utils/index.ts +++ b/redisinsight/api/src/utils/index.ts @@ -6,3 +6,4 @@ export * from './redis-reply-converter'; export * from './hosting-provider-helper'; export * from './analytics-helper'; export * from './redis-connection-helper'; +export * from './class-transformer'; diff --git a/redisinsight/api/src/utils/promise-with-timeout.spec.ts b/redisinsight/api/src/utils/promise-with-timeout.spec.ts new file mode 100644 index 0000000000..90fcc1513f --- /dev/null +++ b/redisinsight/api/src/utils/promise-with-timeout.spec.ts @@ -0,0 +1,38 @@ +import { withTimeout } from 'src/utils/promise-with-timeout'; + +const timeoutException = new Error('Timeout exception'); + +describe('promiseWithTimeout', () => { + it('should throw timeout exception', async () => { + const promise = new Promise((resolve) => { + setTimeout(() => resolve('ok'), 2000); + }); + + try { + await withTimeout(promise, 1000, timeoutException); + } catch (error) { + expect(error).toBe(timeoutException); + } + }); + it('should resolve promise', async () => { + const promise = new Promise((resolve) => { + setTimeout(() => resolve('ok'), 500); + }); + + const result = await withTimeout(promise, 1000, timeoutException); + + expect(result).toEqual('ok'); + }); + it('should reject promise', async () => { + const promiseException = new Error('Promise exception'); + const promise = new Promise((resolve, reject) => { + setTimeout(() => reject(promiseException), 500); + }); + + try { + await withTimeout(promise, 1000, timeoutException); + } catch (error) { + expect(error).toBe(promiseException); + } + }); +}); diff --git a/redisinsight/api/src/utils/promise-with-timeout.ts b/redisinsight/api/src/utils/promise-with-timeout.ts new file mode 100644 index 0000000000..7dbcf9146a --- /dev/null +++ b/redisinsight/api/src/utils/promise-with-timeout.ts @@ -0,0 +1,14 @@ +export const withTimeout = (promise: Promise, delay: number, error: Error): Promise => { + let timer = null; + + return Promise.race([ + new Promise((resolve, reject) => { + timer = setTimeout(reject, delay, error); + return timer; + }), + promise.then((value) => { + clearTimeout(timer); + return value; + }), + ]); +}; diff --git a/redisinsight/api/src/utils/redis-modules-summary.spec.ts b/redisinsight/api/src/utils/redis-modules-summary.spec.ts new file mode 100644 index 0000000000..f80eb973e0 --- /dev/null +++ b/redisinsight/api/src/utils/redis-modules-summary.spec.ts @@ -0,0 +1,71 @@ +import { getRedisModulesSummary } from 'src/utils/redis-modules-summary'; + +const DEFAULT_SUMMARY = Object.freeze( + { + RediSearch: { loaded: false }, + RedisAI: { loaded: false }, + RedisGraph: { loaded: false }, + RedisGears: { loaded: false }, + RedisBloom: { loaded: false }, + RedisJSON: { loaded: false }, + RedisTimeSeries: { loaded: false }, + customModules: [], + }, +); + +const getRedisModulesSummaryTests = [ + { + input: [{ name: 'ai', version: 20000 }], + expected: { ...DEFAULT_SUMMARY, RedisAI: { loaded: true, version: 20000 }, customModules: [] }, + }, + { + input: [{ name: 'search', version: 10000 }], + expected: { ...DEFAULT_SUMMARY, RediSearch: { loaded: true, version: 10000 } }, + }, + { + input: [{ name: 'bf', version: 1000 }, { name: 'rediSQL', version: 1 }], + expected: { + ...DEFAULT_SUMMARY, + RedisBloom: { loaded: true, version: 1000 }, + customModules: [{ name: 'rediSQL', version: 1 }], + }, + }, + { + input: [{ name: 'ReJSON' }], + expected: { ...DEFAULT_SUMMARY, RedisJSON: { loaded: true } }, + }, + { + input: [ + { name: 'ai', version: 10000, semanticVersion: '1.0.0' }, + { name: 'graph', version: 20000, semanticVersion: '2.0.0' }, + { name: 'rg', version: 10000, semanticVersion: '1.0.0' }, + { name: 'bf' }, + { name: 'ReJSON', version: 10000, semanticVersion: '1.0.0' }, + { name: 'search', version: 10000, semanticVersion: '1.0.0' }, + { name: 'timeseries', version: 10000, semanticVersion: '1.0.0' }, + ], + expected: { + RedisAI: { loaded: true, version: 10000, semanticVersion: '1.0.0' }, + RedisGraph: { loaded: true, version: 20000, semanticVersion: '2.0.0' }, + RedisGears: { loaded: true, version: 10000, semanticVersion: '1.0.0' }, + RedisBloom: { loaded: true }, + RedisJSON: { loaded: true, version: 10000, semanticVersion: '1.0.0' }, + RediSearch: { loaded: true, version: 10000, semanticVersion: '1.0.0' }, + RedisTimeSeries: { loaded: true, version: 10000, semanticVersion: '1.0.0' }, + customModules: [], + }, + }, + { input: [], expected: DEFAULT_SUMMARY }, + { input: {}, expected: DEFAULT_SUMMARY }, + { input: undefined, expected: DEFAULT_SUMMARY }, + { input: null, expected: DEFAULT_SUMMARY }, + { input: 1, expected: DEFAULT_SUMMARY }, +]; + +describe('getRedisModulesSummary', () => { + test.each(getRedisModulesSummaryTests)('%j', ({ input, expected }) => { + // @ts-ignore + const result = getRedisModulesSummary(input); + expect(result).toEqual(expected); + }); +}); diff --git a/redisinsight/api/src/utils/redis-modules-summary.ts b/redisinsight/api/src/utils/redis-modules-summary.ts new file mode 100644 index 0000000000..93e05295fa --- /dev/null +++ b/redisinsight/api/src/utils/redis-modules-summary.ts @@ -0,0 +1,51 @@ +import { cloneDeep } from 'lodash'; +import { RedisModules, SUPPORTED_REDIS_MODULES } from 'src/constants'; +import { RedisModuleDto } from 'src/modules/instances/dto/database-instance.dto'; + +interface IModuleSummary { + loaded: boolean; + version?: number; + semanticVersion?: number; +} +interface IRedisModulesSummary extends Record { + customModules: RedisModuleDto[] +} +export const DEFAULT_SUMMARY: IRedisModulesSummary = Object.freeze( + { + RediSearch: { loaded: false }, + RedisAI: { loaded: false }, + RedisGraph: { loaded: false }, + RedisGears: { loaded: false }, + RedisBloom: { loaded: false }, + RedisJSON: { loaded: false }, + RedisTimeSeries: { loaded: false }, + customModules: [], + }, +); + +const getEnumKeyBValue = (myEnum: any, enumValue: number | string): string => { + const keys = Object.keys(myEnum); + const index = keys.findIndex((x) => myEnum[x] === enumValue); + return index > -1 ? keys[index] : ''; +}; + +export const getRedisModulesSummary = (modules: RedisModuleDto[] = []): IRedisModulesSummary => { + const summary = cloneDeep(DEFAULT_SUMMARY); + try { + modules.forEach(((module) => { + if (SUPPORTED_REDIS_MODULES[module.name]) { + const moduleName = getEnumKeyBValue(RedisModules, module.name); + summary[moduleName] = { + loaded: true, + version: module.version, + semanticVersion: module.semanticVersion, + }; + } else { + summary.customModules.push(module); + } + })); + } catch (e) { + // continue regardless of error + } + return summary; +}; diff --git a/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_cluster_command.test.ts b/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_cluster_command.test.ts index 13c7e1cdc0..4bbe29a047 100644 --- a/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_cluster_command.test.ts +++ b/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_cluster_command.test.ts @@ -74,6 +74,8 @@ describe('POST /instance/:instanceId/cli/:uuid/send-cluster-command', () => { requirements('rte.type=CLUSTER'); before(rte.data.truncate); + // Create Redis client for CLI + before(async () => await request(server).patch(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`)) describe('Validation', () => { generateInvalidDataTestCases(dataSchema, validInputData).map( @@ -284,4 +286,29 @@ describe('POST /instance/:instanceId/cli/:uuid/send-cluster-command', () => { } })).map(mainCheckFn); }) + + describe('Client', () => { + [ + { + name: 'Should throw ClientNotFoundError', + data: { + command: 'info', + role: 'ALL', + outputFormat: 'TEXT', + }, + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Client not found or it has been disconnected.', + name: 'ClientNotFoundError', + }, + before: async function () { + await request(server).delete(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`) + }, + after: async function () { + await request(server).patch(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`) + }, + }, + ].map(mainCheckFn); + }) }); diff --git a/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_command.test.ts b/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_command.test.ts index 1199e67dc0..ba5e28740c 100644 --- a/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_command.test.ts +++ b/redisinsight/api/test/api/cli/POST-instance-id-cli-uuid-send_command.test.ts @@ -61,7 +61,10 @@ const mainCheckFn = async (testCase) => { describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { requirements('rte.type=STANDALONE'); + before(rte.data.truncate); + // Create Redis client for CLI + before(async () => await request(server).patch(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`)) describe('Validation', () => { generateInvalidDataTestCases(dataSchema, validInputData).map( @@ -474,8 +477,10 @@ describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { expect(body.response[3]).to.eql(['NOOFFSETS']); expect(body.response[4]).to.eql('index_definition'); expect(_.take(body.response[5], 4)).to.eql( ['key_type', 'HASH', 'prefixes', [constants.TEST_SEARCH_HASH_KEY_PREFIX_1]]); - expect(body.response[6]).to.eql('fields'); - expect(body.response[7]).to.deep.include( [ 'title', 'type', 'TEXT', 'WEIGHT', '5' ]); + // redisearch return attributes in the current build. + // todo: confirm that there were breaking changes in the new redisearch release + // expect(body.response[6]).to.eql('fields'); + // expect(body.response[7]).to.deep.include( [ 'title', 'type', 'TEXT', 'WEIGHT', '5' ]); }, }, { @@ -529,8 +534,9 @@ describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { { name: 'Should create index', data: { - command: `ft.create ${constants.TEST_SEARCH_JSON_INDEX_1} ON JSON NOOFFSETS - SCHEMA $.user.name AS name TEXT`, + command: `ft.create ${constants.TEST_SEARCH_JSON_INDEX_1} ON JSON + PREFIX 1 ${constants.TEST_SEARCH_JSON_KEY_PREFIX_1} + NOOFFSETS SCHEMA $.user.name AS name TEXT`, outputFormat: 'TEXT', }, responseSchema, @@ -557,9 +563,9 @@ describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { expect(body.response[2]).to.eql('index_options'); expect(body.response[3]).to.eql(['NOOFFSETS']); expect(body.response[4]).to.eql('index_definition'); - expect(_.take(body.response[5], 4)).to.eql( ['key_type', 'JSON', 'prefixes', ['']]); - expect(body.response[6]).to.eql('fields'); - expect(body.response[7]).to.deep.include( [ 'name', 'type', 'TEXT', 'WEIGHT', '1' ]); + expect(_.take(body.response[5], 4)).to.eql( ['key_type', 'JSON', 'prefixes', [ constants.TEST_SEARCH_JSON_KEY_PREFIX_1 ]]); + // expect(body.response[6]).to.eql('fields'); + // expect(body.response[7]).to.deep.include( [ 'name', 'type', 'TEXT', 'WEIGHT', '1' ]); }, }, { @@ -874,6 +880,9 @@ describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { outputFormat: 'TEXT', }, responseSchema, + before: async () => { + await request(server).patch(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`); + }, after: async () => { expect(await rte.client.exists(constants.TEST_LIST_KEY_1)).to.eql(0); } @@ -961,4 +970,28 @@ describe('POST /instance/:instanceId/cli/:uuid/send-command', () => { }, ].map(mainCheckFn); }) + + describe('Client', () => { + [ + { + name: 'Should throw ClientNotFoundError', + data: { + command: `info`, + outputFormat: 'TEXT', + }, + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Client not found or it has been disconnected.', + name: 'ClientNotFoundError', + }, + before: async function () { + await request(server).delete(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`) + }, + after: async function () { + await request(server).patch(`/instance/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`) + }, + }, + ].map(mainCheckFn); + }) }); diff --git a/redisinsight/api/test/api/commands/GET-commands.test.ts b/redisinsight/api/test/api/commands/GET-commands.test.ts index f3bab7c119..a4bb916aeb 100644 --- a/redisinsight/api/test/api/commands/GET-commands.test.ts +++ b/redisinsight/api/test/api/commands/GET-commands.test.ts @@ -33,6 +33,8 @@ describe('GET /commands', () => { expect(body['GET']).to.be.an('object'); expect(body['FT.CREATE']).to.be.an('object'); expect(body['JSON.GET']).to.be.an('object'); + expect(body['RG.PYEXECUTE']).to.be.an('object'); + expect(body['BF.RESERVE']).to.be.an('object'); }, }, ].map(mainCheckFn); diff --git a/redisinsight/api/test/api/hash/POST-instance-id-hash-get_fields.test.ts b/redisinsight/api/test/api/hash/POST-instance-id-hash-get_fields.test.ts index efa969c8a1..e082460a23 100644 --- a/redisinsight/api/test/api/hash/POST-instance-id-hash-get_fields.test.ts +++ b/redisinsight/api/test/api/hash/POST-instance-id-hash-get_fields.test.ts @@ -200,28 +200,26 @@ describe('POST /instance/:instanceId/hash/get-fields', () => { ].map(mainCheckFn); describe('Search in huge number of fields', () => { - requirements('rte.onPremise'); - // Number of fields to generate. Could be 10M or even more but consume much more time - // We decide to generate 500K which should take ~10s - const NUMBER_OF_FIELDS = 500 * 1000; - before(async () => await rte.data.generateHugeNumberOfFieldsForHashKey(NUMBER_OF_FIELDS, true)); + requirements('rte.bigData'); + // number of hash fields inside existing data (1M fields) + const NUMBER_OF_FIELDS = 1_000_000; [ { name: 'Should find exact one key', data: { - keyName: constants.TEST_HASH_KEY_1, + keyName: constants.TEST_HASH_HUGE_KEY, cursor: 0, count: 15, - match: 'f_48900' + match: constants.TEST_HASH_HUGE_KEY_FIELD }, responseSchema, checkFn: ({ body }) => { - expect(body.keyName).to.eql(constants.TEST_HASH_KEY_1); + expect(body.keyName).to.eql(constants.TEST_HASH_HUGE_KEY); expect(body.total).to.eql(NUMBER_OF_FIELDS); expect(body.fields.length).to.eq(1); - expect(body.fields[0].field).to.eql('f_48900'); - expect(body.fields[0].value).to.eql('v'); + expect(body.fields[0].field).to.eql(constants.TEST_HASH_HUGE_KEY_FIELD); + expect(body.fields[0].value).to.eql(constants.TEST_HASH_HUGE_KEY_VALUE); } }, ].map(mainCheckFn); diff --git a/redisinsight/api/test/api/hash/POST-instance-id-hash.test.ts b/redisinsight/api/test/api/hash/POST-instance-id-hash.test.ts index e814964746..79be6a5da4 100644 --- a/redisinsight/api/test/api/hash/POST-instance-id-hash.test.ts +++ b/redisinsight/api/test/api/hash/POST-instance-id-hash.test.ts @@ -64,7 +64,11 @@ const mainCheckFn = async (testCase) => { expect(await rte.client.hgetall(testCase.data.keyName)).to.eql({ [testCase.data.fields[0].field]: testCase.data.fields[0].value, }); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/api/instance/GET-instance-id-overview.test.ts b/redisinsight/api/test/api/instance/GET-instance-id-overview.test.ts index a7bcf9b8b9..5fd1d1d79f 100644 --- a/redisinsight/api/test/api/instance/GET-instance-id-overview.test.ts +++ b/redisinsight/api/test/api/instance/GET-instance-id-overview.test.ts @@ -1,4 +1,4 @@ -import { describe, it, deps, validateApiCall, before, expect } from '../deps'; +import { describe, it, deps, validateApiCall, before, expect, requirements } from '../deps'; import { Joi } from '../../helpers/test'; const { localDb, request, server, constants, rte } = deps; @@ -7,13 +7,13 @@ const endpoint = (instanceId = constants.TEST_INSTANCE_ID) => const responseSchema = Joi.object().keys({ version: Joi.string().required(), - totalKeys: Joi.number().integer().allow(null).required(), - usedMemory: Joi.number().integer().allow(null).required(), - connectedClients: Joi.number().allow(null).required(), - opsPerSecond: Joi.number().allow(null).required(), - networkInKbps: Joi.number().allow(null).required(), - networkOutKbps: Joi.number().integer().allow(null).required(), - cpuUsagePercentage: Joi.number().allow(null).required(), + totalKeys: Joi.number().integer().allow(null), + usedMemory: Joi.number().integer().allow(null), + connectedClients: Joi.number().allow(null), + opsPerSecond: Joi.number().allow(null), + networkInKbps: Joi.number().allow(null), + networkOutKbps: Joi.number().integer().allow(null), + cpuUsagePercentage: Joi.number().allow(null), }).required(); const mainCheckFn = async (testCase) => { @@ -56,4 +56,25 @@ describe('GET /instance/:instanceId/overview', () => { }, }, ].map(mainCheckFn); + + describe('Enterprise', () => { + requirements('rte.re'); + + [ + { + name: 'Should get database overview except CPU', + responseSchema, + checkFn: ({body}) => { + expect(body.version).to.eql(rte.env.version); + expect(body.cpuUsagePercentage).to.eql(undefined) + expect(body.totalKeys).to.not.eql(undefined) + expect(body.connectedClients).to.not.eql(undefined) + expect(body.opsPerSecond).to.not.eql(undefined) + expect(body.networkInKbps).to.not.eql(undefined) + expect(body.networkOutKbps).to.not.eql(undefined) + expect(body.usedMemory).to.not.eql(undefined) + } + }, + ].map(mainCheckFn); + }) }); diff --git a/redisinsight/api/test/api/instance/POST-instance-sentinel_masters.test.ts b/redisinsight/api/test/api/instance/POST-instance-sentinel_masters.test.ts index de1e5ab3d3..d81291beef 100644 --- a/redisinsight/api/test/api/instance/POST-instance-sentinel_masters.test.ts +++ b/redisinsight/api/test/api/instance/POST-instance-sentinel_masters.test.ts @@ -1,5 +1,5 @@ -import { Joi, expect, describe, it, deps, requirements, validateApiCall } from '../deps'; -const { rte, request, server, constants } = deps; +import { Joi, expect, describe, after, it, deps, requirements, validateApiCall } from '../deps'; +const { rte, request, server, constants, localDb } = deps; const endpoint = () => request(server).post('/instance/sentinel-masters'); @@ -12,6 +12,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({ describe('POST /instance/sentinel-masters', () => { requirements('rte.type=SENTINEL'); + after(localDb.initAgreements); // todo: add validation tests describe('Validation', function () {}); @@ -36,11 +37,52 @@ describe('POST /instance/sentinel-masters', () => { }], }, responseSchema, - checkFn: ({ body }) => { + checkFn: async ({ body }) => { + expect(body.length).to.eql(1); + expect(body[0].name).to.eql(constants.TEST_SENTINEL_MASTER_GROUP); + expect(body[0].status).to.eql('success'); + expect(body[0].message).to.eql('Added'); + + const db: any = await (await localDb.getRepository(localDb.repositories.INSTANCE)).findOne(body[0].id); + + expect(db.password).to.eql(localDb.encryptData(constants.TEST_REDIS_PASSWORD)); + expect(db.sentinelMasterPassword).to.eql(localDb.encryptData(constants.TEST_SENTINEL_MASTER_PASS)); + }, + }); + }); + it('Create sentinel database with plain pass', async () => { + await localDb.setAgreements({ + encryption: false, + }); + + const dbName = constants.getRandomString(); + + await validateApiCall({ + endpoint, + statusCode: 201, + data: { + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, + username: constants.TEST_REDIS_USER, + password: constants.TEST_REDIS_PASSWORD, + masters: [{ + alias: dbName, + name: constants.TEST_SENTINEL_MASTER_GROUP, + username: constants.TEST_SENTINEL_MASTER_USER, + password: constants.TEST_SENTINEL_MASTER_PASS, + }], + }, + responseSchema, + checkFn: async ({ body }) => { expect(body.length).to.eql(1); expect(body[0].name).to.eql(constants.TEST_SENTINEL_MASTER_GROUP); expect(body[0].status).to.eql('success'); expect(body[0].message).to.eql('Added'); + + const db: any = await (await localDb.getRepository(localDb.repositories.INSTANCE)).findOne(body[0].id); + + expect(db.password).to.eql(constants.TEST_REDIS_PASSWORD); + expect(db.sentinelMasterPassword).to.eql(constants.TEST_SENTINEL_MASTER_PASS); }, }); }); @@ -87,6 +129,12 @@ describe('POST /instance/sentinel-masters', () => { }, }); + // Create client for CLI + await validateApiCall({ + endpoint: () => request(server).patch(`/instance/${addedId}/cli/${cliUuid}`), + statusCode: 200, + }); + // Create string using CLI API to 0 db index await validateApiCall({ endpoint: () => request(server).post(`/instance/${addedId}/cli/${cliUuid}/send-command`), @@ -98,12 +146,12 @@ describe('POST /instance/sentinel-masters', () => { // check data created by db index await rte.data.executeCommand('select', `${constants.TEST_REDIS_DB_INDEX}`); - expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(0) + expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(1) expect(await rte.data.executeCommand('exists', browserKeyName)).to.eql(1) // check data created by db index await rte.data.executeCommand('select', '0'); - expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(1) + expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(0) expect(await rte.data.executeCommand('exists', browserKeyName)).to.eql(0) }); }); diff --git a/redisinsight/api/test/api/instance/POST-instance.test.ts b/redisinsight/api/test/api/instance/POST-instance.test.ts index 83a4478e29..c5d34938a7 100644 --- a/redisinsight/api/test/api/instance/POST-instance.test.ts +++ b/redisinsight/api/test/api/instance/POST-instance.test.ts @@ -1,4 +1,4 @@ -import { Joi, expect, describe, it, before, deps, requirements, validateApiCall } from '../deps'; +import {Joi, expect, describe, it, before, deps, requirements, validateApiCall, after} from '../deps'; const { rte, request, server, localDb, constants } = deps; const endpoint = () => request(server).post('/instance'); @@ -121,6 +121,12 @@ describe('POST /instance', () => { }, }); + // Create client for CLI + await validateApiCall({ + endpoint: () => request(server).patch(`/instance/${addedId}/cli/${cliUuid}`), + statusCode: 200, + }); + // Create string using CLI API to 0 db index await validateApiCall({ endpoint: () => request(server).post(`/instance/${addedId}/cli/${cliUuid}/send-command`), @@ -130,14 +136,15 @@ describe('POST /instance', () => { }, }); + // check data created by db index await rte.data.executeCommand('select', `${constants.TEST_REDIS_DB_INDEX}`); - expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(0) + expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(1) expect(await rte.data.executeCommand('exists', browserKeyName)).to.eql(1) // check data created by db index await rte.data.executeCommand('select', '0'); - expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(1) + expect(await rte.data.executeCommand('exists', cliKeyName)).to.eql(0) expect(await rte.data.executeCommand('exists', browserKeyName)).to.eql(0) }); }); @@ -301,6 +308,7 @@ describe('POST /instance', () => { }); describe('Create standalone instance tls with certificate auth', function () { requirements('rte.tls', 'rte.tlsAuth'); + after(localDb.initAgreements); let existingCACertId, existingClientCertId, existingClientCertName; before(async () => { @@ -343,6 +351,18 @@ describe('POST /instance', () => { verifyServerCert: true, } }, + checkFn: async ({ body }) => { + const ca: any = await (await localDb.getRepository(localDb.repositories.CA_CERT_REPOSITORY)) + .findOne(body.tls.caCertId); + + expect(ca.certificate).to.eql(localDb.encryptData(constants.TEST_REDIS_TLS_CA)); + + const clientPair: any = await (await localDb.getRepository(localDb.repositories.CLIENT_CERT_REPOSITORY)) + .findOne(body.tls.clientCertPairId); + + expect(clientPair.certificate).to.eql(localDb.encryptData(constants.TEST_USER_TLS_CERT)); + expect(clientPair.key).to.eql(localDb.encryptData(constants.TEST_USER_TLS_KEY)); + }, }); // remember certificates ids @@ -423,6 +443,63 @@ describe('POST /instance', () => { expect(await localDb.getInstanceByName(dbName)).to.eql(undefined); }); + it('Create standalone instance and verify users certs (new certificates !do not encrypt)', async () => { + await localDb.setAgreements({ + encryption: false, + }); + + const dbName = constants.getRandomString(); + const newCaName = constants.getRandomString(); + const newClientCertName = constants.getRandomString(); + // preconditions + expect(await localDb.getInstanceByName(dbName)).to.eql(undefined); + + await validateApiCall({ + endpoint, + statusCode: 201, + data: { + name: dbName, + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, + tls: { + verifyServerCert: true, + newCaCert: { + name: newCaName, + cert: constants.TEST_REDIS_TLS_CA, + }, + newClientCertPair: { + name: newClientCertName, + cert: constants.TEST_USER_TLS_CERT, + key: constants.TEST_USER_TLS_KEY, + } + } + }, + responseSchema, + responseBody: { + name: dbName, + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, + connectionType: constants.STANDALONE, + tls: { + verifyServerCert: true, + } + }, + checkFn: async ({ body }) => { + const ca: any = await (await localDb.getRepository(localDb.repositories.CA_CERT_REPOSITORY)) + .findOne(body.tls.caCertId); + + expect(ca.certificate).to.eql(constants.TEST_REDIS_TLS_CA); + + const clientPair: any = await (await localDb.getRepository(localDb.repositories.CLIENT_CERT_REPOSITORY)) + .findOne(body.tls.clientCertPairId); + + expect(clientPair.certificate).to.eql(constants.TEST_USER_TLS_CERT); + expect(clientPair.key).to.eql(constants.TEST_USER_TLS_KEY); + }, + }); + + expect(await localDb.getInstanceByName(dbName)).to.be.an('object'); + }); }); }); describe('CLUSTER', () => { diff --git a/redisinsight/api/test/api/keys/GET-instance-id-keys.test.ts b/redisinsight/api/test/api/keys/GET-instance-id-keys.test.ts index 7290d76d0f..79bd9cd31c 100644 --- a/redisinsight/api/test/api/keys/GET-instance-id-keys.test.ts +++ b/redisinsight/api/test/api/keys/GET-instance-id-keys.test.ts @@ -50,7 +50,8 @@ describe('GET /instance/:instanceId/keys', () => { // todo: add query validation xdescribe('Validation', () => {}); - describe('Common', () => { + describe('Sandbox rte', () => { + requirements('!rte.sharedData') const KEYS_NUMBER = 1500; // 300 per each base type before(async () => await rte.data.generateNKeys(KEYS_NUMBER, true)); @@ -60,7 +61,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should find key by exact name', query: { cursor: '0', - match: 'str_key_1' + match: `${constants.TEST_RUN_ID}_str_key_1` }, responseSchema, checkFn: ({ body }) => { @@ -80,7 +81,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.total).to.eql(KEYS_NUMBER); expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.eq(1); - expect(result.keys[0].name).to.eq('str_key_1'); + expect(result.keys[0].name).to.eq(`${constants.TEST_RUN_ID}_str_key_1`); } }, { @@ -142,7 +143,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with * in the end', query: { cursor: '0', - match: 'str_key_11*' + match: `${constants.TEST_RUN_ID}_str_key_11*` }, responseSchema, checkFn: ({ body }) => { @@ -163,7 +164,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(11); result.keys.map(({ name }) => { - expect(name.indexOf('str_key_11')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_11`)).to.eql(0); }) } }, @@ -200,7 +201,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with * in the middle', query: { cursor: '0', - match: 'str_*_111' + match: `${constants.TEST_RUN_ID}_str_*_111` }, responseSchema, checkFn: ({ body }) => { @@ -220,14 +221,14 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.total).to.eql(KEYS_NUMBER); expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.eq(1); - expect(result.keys[0].name).to.eq('str_key_111'); + expect(result.keys[0].name).to.eq(`${constants.TEST_RUN_ID}_str_key_111`); } }, { name: 'Should search by with ? in the end', query: { cursor: '0', - match: 'str_key_10?' + match: `${constants.TEST_RUN_ID}_str_key_10?` }, responseSchema, checkFn: ({ body }) => { @@ -248,7 +249,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(10); result.keys.map(({ name }) => { - expect(name.indexOf('str_key_10')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_10`)).to.eql(0); }) } }, @@ -256,7 +257,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with [a-b] glob pattern', query: { cursor: '0', - match: 'str_key_10[0-5]' + match: `${constants.TEST_RUN_ID}_str_key_10[0-5]` }, responseSchema, checkFn: ({ body }) => { @@ -277,7 +278,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(1).lte(6); result.keys.map(({ name }) => { - expect(name.indexOf('str_key_10')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_10`)).to.eql(0); }) } }, @@ -285,7 +286,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with [a,b,c] glob pattern', query: { cursor: '0', - match: 'str_key_10[0,1,2]' + match: `${constants.TEST_RUN_ID}_str_key_10[0,1,2]` }, responseSchema, checkFn: ({body}) => { @@ -306,7 +307,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(1).lte(3); result.keys.map(({name}) => { - expect(name.indexOf('str_key_10')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_10`)).to.eql(0); }) } }, @@ -314,7 +315,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with [abc] glob pattern', query: { cursor: '0', - match: 'str_key_10[012]' + match: `${constants.TEST_RUN_ID}_str_key_10[012]` }, responseSchema, checkFn: ({ body }) => { @@ -335,7 +336,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(1).lte(3); result.keys.map(({ name }) => { - expect(name.indexOf('str_key_10')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_10`)).to.eql(0); }) } }, @@ -343,7 +344,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with [^a] glob pattern', query: { cursor: '0', - match: 'str_key_10[^0]' + match: `${constants.TEST_RUN_ID}_str_key_10[^0]` }, responseSchema, checkFn: ({ body }) => { @@ -364,7 +365,7 @@ describe('GET /instance/:instanceId/keys', () => { expect(result.scanned).to.gte(KEYS_NUMBER); expect(result.keys.length).to.gte(9); result.keys.map(({ name }) => { - expect(name.indexOf('str_key_10')).to.eql(0); + expect(name.indexOf(`${constants.TEST_RUN_ID}_str_key_10`)).to.eql(0); }) } }, @@ -372,7 +373,7 @@ describe('GET /instance/:instanceId/keys', () => { name: 'Should search by with combined glob patterns', query: { cursor: '0', - match: 's?r_*_[1][0-5][^0]' + match: `${constants.TEST_RUN_ID}_s?r_*_[1][0-5][^0]` }, responseSchema, checkFn: ({ body }) => { @@ -680,32 +681,6 @@ describe('GET /instance/:instanceId/keys', () => { ].map(mainCheckFn); }); }); - - describe('Exact search on huge keys number', () => { - requirements('rte.onPremise'); - // Number of keys to generate. Could be 10M or even more but consume much more time - // We decide to generate 500K which should take ~10s - const NUMBER_OF_KEYS = 500 * 1000; - before(async () => await rte.data.generateHugeNumberOfTinyStringKeys(NUMBER_OF_KEYS, true)); - - [ - { - name: 'Should scan all types', - query: { - cursor: '0', - match: 'k_488500' - }, - responseSchema, - checkFn: ({ body }) => { - expect(body[0].total).to.eql(NUMBER_OF_KEYS); - expect(body[0].scanned).to.eql(NUMBER_OF_KEYS); - expect(body[0].cursor).to.eql(0); - expect(body[0].keys.length).to.eql(1); - expect(body[0].keys[0].name).to.eql('k_488500'); - } - }, - ].map(mainCheckFn); - }); }); describe('Cluster', () => { requirements('rte.type=CLUSTER'); @@ -832,7 +807,33 @@ describe('GET /instance/:instanceId/keys', () => { }); }); }); + describe('Big data', () => { + describe('Exact search on huge keys number', () => { + requirements('rte.bigData'); + // keys inside existing data (~3.6M) but we will check for at least 10M to have a possibility to change + // keys number at some point + const NUMBER_OF_KEYS = 3_000_000; + const key = 'user:15001:string'; + [ + { + name: 'Should scan all types', + query: { + cursor: '0', + match: key + }, + responseSchema, + checkFn: ({ body }) => { + expect(body[0].total).to.gte(NUMBER_OF_KEYS); + expect(body[0].scanned).to.gte(NUMBER_OF_KEYS); + expect(body[0].cursor).to.eql(0); + expect(body[0].keys.length).to.eql(1); + expect(body[0].keys[0].name).to.eql(key); + } + }, + ].map(mainCheckFn); + }); + }); describe('ACL', () => { requirements('rte.acl'); before(async () => await rte.data.generateKeys(true)); diff --git a/redisinsight/api/test/api/keys/PATCH-instance-id-keys-ttl.test.ts b/redisinsight/api/test/api/keys/PATCH-instance-id-keys-ttl.test.ts index d895f17fde..3fd3b8ac8d 100644 --- a/redisinsight/api/test/api/keys/PATCH-instance-id-keys-ttl.test.ts +++ b/redisinsight/api/test/api/keys/PATCH-instance-id-keys-ttl.test.ts @@ -69,7 +69,7 @@ describe('PATCH /instance/:instanceId/keys/ttl', () => { }, responseSchema, after: async () => { - expect(await rte.client.ttl(constants.TEST_STRING_KEY_2)).to.eql(300) + expect(await rte.client.ttl(constants.TEST_STRING_KEY_2)).to.gte(300 - 5) } }, { diff --git a/redisinsight/api/test/api/list/POST-instance-id-list-get_elements-index.test.ts b/redisinsight/api/test/api/list/POST-instance-id-list-get_elements-index.test.ts index a48fb0e82c..502e9ade69 100644 --- a/redisinsight/api/test/api/list/POST-instance-id-list-get_elements-index.test.ts +++ b/redisinsight/api/test/api/list/POST-instance-id-list-get_elements-index.test.ts @@ -159,6 +159,24 @@ describe('POST /instance/:instanceId/list/get-elements/:index', () => { }, }, ].map(mainCheckFn); + + describe('Search in huge number of elements', () => { + requirements('rte.bigData'); + [ + { + endpoint: () => endpoint(constants.TEST_INSTANCE_ID, constants.TEST_LIST_HUGE_INDEX), + name: 'Should get element from particular position', + data: { + keyName: constants.TEST_LIST_HUGE_KEY, + }, + responseSchema, + responseBody: { + keyName: constants.TEST_LIST_HUGE_KEY, + value: constants.TEST_LIST_HUGE_ELEMENT, + }, + }, + ].map(mainCheckFn); + }); }); describe('ACL', () => { diff --git a/redisinsight/api/test/api/list/POST-instance-id-list.test.ts b/redisinsight/api/test/api/list/POST-instance-id-list.test.ts index a3212853d2..6378e50201 100644 --- a/redisinsight/api/test/api/list/POST-instance-id-list.test.ts +++ b/redisinsight/api/test/api/list/POST-instance-id-list.test.ts @@ -52,7 +52,11 @@ const mainCheckFn = async (testCase) => { if (testCase.statusCode === 201) { expect(await rte.client.exists(testCase.data.keyName)).to.eql(1); expect(await rte.client.lrange(testCase.data.keyName, 0, 100)).to.eql([testCase.data.element]); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/api/instance/GET-instance-id-plugin-commands.test.ts b/redisinsight/api/test/api/plugins/GET-instance-id-plugins-commands.test.ts similarity index 91% rename from redisinsight/api/test/api/instance/GET-instance-id-plugin-commands.test.ts rename to redisinsight/api/test/api/plugins/GET-instance-id-plugins-commands.test.ts index 7afd2cddb1..c2557f529a 100644 --- a/redisinsight/api/test/api/instance/GET-instance-id-plugin-commands.test.ts +++ b/redisinsight/api/test/api/plugins/GET-instance-id-plugins-commands.test.ts @@ -3,7 +3,7 @@ import { Joi } from '../../helpers/test'; const { localDb, request, server, constants, rte } = deps; const endpoint = (instanceId = constants.TEST_INSTANCE_ID) => - request(server).get(`/instance/${instanceId}/plugin-commands`); + request(server).get(`/instance/${instanceId}/plugins/commands`); const responseSchema = Joi.array().items(Joi.string()).required(); @@ -16,7 +16,7 @@ const mainCheckFn = async (testCase) => { }); }; -describe('GET /instance/:instanceId/plugin-commands', () => { +describe('GET /instance/:instanceId/plugins/commands', () => { before(localDb.createDatabaseInstances); [ diff --git a/redisinsight/api/test/api/plugins/GET-instance-id-plugins-id-command_executions-id-state.test.ts b/redisinsight/api/test/api/plugins/GET-instance-id-plugins-id-command_executions-id-state.test.ts new file mode 100644 index 0000000000..853ac595df --- /dev/null +++ b/redisinsight/api/test/api/plugins/GET-instance-id-plugins-id-command_executions-id-state.test.ts @@ -0,0 +1,86 @@ +import { + expect, + describe, + it, + Joi, + _, + deps, + validateApiCall, +} from '../deps'; +const { server, request, constants, localDb } = deps; + +// endpoint to test +const endpoint = ( + instanceId = constants.TEST_INSTANCE_ID, + visualizationId = constants.TEST_PLUGIN_VISUALIZATION_ID_1, + id = constants.TEST_COMMAND_EXECUTION_ID_1, +) => + request(server).get(`/instance/${instanceId}/plugins/${visualizationId}/command-executions/${id}/state`); + +const responseSchema = Joi.object().keys({ + commandExecutionId: Joi.string().required(), + visualizationId: Joi.string().required(), + state: Joi.any().required(), + createdAt: Joi.date().required(), + updatedAt: Joi.date().required(), +}).required(); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('POST /instance/:instanceId/plugins/:vId/command-executions/:id/state', () => { + describe('Common', () => { + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint( + constants.TEST_NOT_EXISTED_INSTANCE_ID, + constants.TEST_PLUGIN_VISUALIZATION_ID_1, + constants.TEST_NOT_EXISTED_INSTANCE_ID, + ), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Plugin state was not found.', + error: 'Not Found' + }, + }, + { + name: 'Should get string', + responseSchema, + checkFn: async ({ body }) => { + expect(body.commandExecutionId).to.eql(constants.TEST_COMMAND_EXECUTION_ID_1); + expect(body.visualizationId).to.eql(constants.TEST_PLUGIN_VISUALIZATION_ID_1); + expect(body.state).to.eql('some state'); + }, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1, true); + + await localDb.generatePluginState({ + commandExecutionId: constants.TEST_COMMAND_EXECUTION_ID_1, + visualizationId: constants.TEST_PLUGIN_VISUALIZATION_ID_1, + }, true); + } + }, + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/plugins/POST-instance-id-plugins-command_executions.test.ts b/redisinsight/api/test/api/plugins/POST-instance-id-plugins-command_executions.test.ts new file mode 100644 index 0000000000..0b8921953f --- /dev/null +++ b/redisinsight/api/test/api/plugins/POST-instance-id-plugins-command_executions.test.ts @@ -0,0 +1,475 @@ +import { + expect, + before, + describe, + it, + Joi, + _, + deps, + generateInvalidDataTestCases, + validateInvalidDataTestCase, + validateApiCall, + requirements, +} from '../deps'; +const { server, request, constants, rte, localDb } = deps; + +// endpoint to test +const endpoint = (instanceId = constants.TEST_INSTANCE_ID) => + request(server).post(`/instance/${instanceId}/plugins/command-executions`); + +// input data schema +const dataSchema = Joi.object({ + command: Joi.string().required(), + role: Joi.string().valid('ALL', 'MASTER', 'SLAVE').allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + // todo: fix BE transform to avoid handle boolean as number + port: Joi.number().required().allow(true), + enableRedirection: Joi.boolean().required().messages({ + 'any.required': '{#label} should not be null or undefined', + }), + }).allow(null), +}).messages({ + 'any.required': '{#label} should not be empty', +}).strict(); + +const validInputData = { + command: 'set foo bar', + role: 'ALL', + nodeOptions: { + host: 'localhost', + port: 6379, + enableRedirection: true, + } +}; + +const responseSchema = Joi.object().keys({ + databaseId: Joi.string().required(), + command: Joi.string().required(), + result: Joi.array().items(Joi.object({ + response: Joi.any().required(), + status: Joi.string().required(), + node: Joi.object({ + host: Joi.string().required(), + port: Joi.number().required(), + slot: Joi.number(), + }), + })), + role: Joi.string().allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + port: Joi.number().required(), + enableRedirection: Joi.boolean().required(), + }).allow(null), +}).required(); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('POST /instance/:instanceId/plugins/command-executions', () => { + before(rte.data.truncate); + + describe('Validation', () => { + generateInvalidDataTestCases(dataSchema, validInputData).map( + validateInvalidDataTestCase(endpoint, dataSchema), + ); + }); + + describe('Common', () => { + describe('String', () => { + const bigStringValue = Buffer.alloc(1023 * 1024, 'a').toString(); + + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint(constants.TEST_NOT_EXISTED_INSTANCE_ID), + statusCode: 404, + data: { + command: 'get foo', + }, + responseBody: { + statusCode: 404, + message: 'Invalid database instance id.', + error: 'Not Found' + }, + }, + { + name: 'Should get string', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.command).to.eql(`get ${constants.TEST_STRING_KEY_1}`); + expect(body.result.length).to.eql(1); + expect(body.result[0].response).to.eql(bigStringValue); + expect(body.result[0].status).to.eql('success'); + }, + before: async () => { + expect(await rte.client.set(constants.TEST_STRING_KEY_1, bigStringValue)); + } + }, + ].map(mainCheckFn); + }); + describe('RediSearch', () => { + requirements('rte.modules.search'); + [ + { + name: 'Should support ft.info command (whitelist case insensitive check)', + data: { + command: `ft.info ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + }, + ].map(mainCheckFn); + }); + describe('Bad commands', () => { + [ + { + name: 'Should return error if try to run unsupported command (monitor)', + data: { + command: `monitor`, + }, + }, + { + name: 'Should return error if try to run unsupported command (subscribe)', + data: { + command: `subscribe`, + }, + }, + { + name: 'Should return error if try to run unsupported command (psubscribe)', + data: { + command: `psubscribe`, + }, + }, + { + name: 'Should return error if try to run unsupported command (sync)', + data: { + command: `sync`, + }, + }, + { + name: 'Should return error if try to run unsupported command (psync)', + data: { + command: `psync`, + }, + }, + { + name: 'Should return error if try to run unsupported command (script debug)', + data: { + command: `script debug`, + }, + }, + { + name: 'Should return error if try to run blocking command', + data: { + command: `blpop key`, + }, + }, + { + name: 'Should return error if try to run not readonly command', + data: { + command: `set string_key value`, + }, + }, + ].map((testCase) => mainCheckFn({ + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('fail'); + expect(body.result[0].response).to.include('command is not allowed by the RedisInsight Plugins'); + }, + ...testCase, + })); + }); + describe('History items limit', () => { + it('Number of history items should be less then 30', async () => { + const repo = await (localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)); + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + createdAt: new Date(Date.now() - 1000) + }, 30, true); + + for (let i = 0; i < 40; i++) { + await validateApiCall( { + endpoint, + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + + const count = await repo.count({ databaseId: constants.TEST_INSTANCE_ID }); + expect(count).to.lte(30); + + // check that the last execution command was not deleted + // await repo.findOneOrFail({ id: body.id }); // sometimes localDb is not in sync. investigate + }, + }); + } + }); + }); + }); + describe('Standalone + Sentinel', () => { + requirements('!rte.type=CLUSTER'); + + describe('Incorrect requests for redis client type', () => { + [ + { + name: 'Should return error if try to execute command for role for standalone database', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'ALL', + }, + statusCode: 400, + responseBody: { + statusCode: 400, + error: 'Bad Request', + message: 'Wrong database type.', + }, + }, + { + name: 'Should return error if try to execute command for particular node for standalone database', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + host: 'localhost', + port: 6379, + enableRedirection: true, + } + }, + statusCode: 400, + responseBody: { + statusCode: 400, + error: 'Bad Request', + message: 'Wrong database type.', + }, + }, + ].map(mainCheckFn); + }); + }); + describe('Cluster', () => { + requirements('rte.type=CLUSTER'); + requirements('!rte.re'); + + let database; + let nodes; + + before(async () => { + database = await (await localDb.getRepository(localDb.repositories.INSTANCE)).findOne({ + id: constants.TEST_INSTANCE_ID, + }); + nodes = JSON.parse(database.nodes); + }); + + describe('Commands using role', () => { + [ + { + name: 'Get command with role=ALL', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'ALL', + }, + responseSchema, + before: async () => { + await rte.client.set(constants.TEST_STRING_KEY_1, constants.TEST_STRING_VALUE_1); + }, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.eql(nodes.length); + expect(body.role).to.eql('ALL'); + expect(body.nodeOptions).to.eql(undefined); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gt(0); + expect(resultSummary.succeed).to.gt(0); + expect(resultSummary.moved + resultSummary.succeed).to.eq(nodes.length) + }, + }, + { + name: 'Get command with role=MASTER', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'MASTER', + }, + responseSchema, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.lte(nodes.length); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gt(0); + expect(resultSummary.succeed).to.gt(0); + expect(resultSummary.moved + resultSummary.succeed).to.lte(nodes.length) + }, + }, + { + name: 'Get command with role=SLAVE should return all failed responses', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'SLAVE', + }, + responseSchema, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.lte(nodes.length); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gte(0); + expect(resultSummary.succeed).to.gte(0); + expect(resultSummary.moved + resultSummary.succeed).to.lte(nodes.length) + }, + }, + ].map(mainCheckFn); + }); + describe('Commands using nodeOptions', () => { + [ + { + name: 'Incorrect node should return an error', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + host: 'unreachable', + port: 6380, + enableRedirection: true, + }, + }, + statusCode: 400, + responseBody: { + statusCode: 400, + message: 'Node unreachable:6380 not exist in OSS Cluster.', + error: 'Bad Request' + }, + before: async () => { + await rte.client.set(constants.TEST_STRING_KEY_1, constants.TEST_STRING_VALUE_1); + }, + }, + ].map(mainCheckFn); + + it('Should auto redirect and never fail', async () => { + await validateApiCall( { + endpoint, + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + ...nodes[0], + enableRedirection: true, + }, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.nodeOptions).to.eql({ + ...nodes[0], + enableRedirection: true, + }); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response).to.eql(constants.TEST_STRING_VALUE_1); + }, + }); + }); + }); + }); +}); diff --git a/redisinsight/api/test/api/plugins/POST-instance-id-plugins-id-command_executions-id-state.test.ts b/redisinsight/api/test/api/plugins/POST-instance-id-plugins-id-command_executions-id-state.test.ts new file mode 100644 index 0000000000..a5d36a362c --- /dev/null +++ b/redisinsight/api/test/api/plugins/POST-instance-id-plugins-id-command_executions-id-state.test.ts @@ -0,0 +1,153 @@ +import { + expect, + before, + describe, + it, + Joi, + _, + deps, + generateInvalidDataTestCases, + validateInvalidDataTestCase, + validateApiCall, +} from '../deps'; +const { server, request, constants, localDb } = deps; + +// endpoint to test +const endpoint = ( + instanceId = constants.TEST_INSTANCE_ID, + visualizationId = constants.TEST_PLUGIN_VISUALIZATION_ID_1, + id = constants.TEST_COMMAND_EXECUTION_ID_1, +) => + request(server).post(`/instance/${instanceId}/plugins/${visualizationId}/command-executions/${id}/state`); + +// input data schema +const dataSchema = Joi.object({ + state: Joi.any().required(), +}).messages({ + 'any.required': '{#label} should be defined', +}).strict(); + +const validInputData = { + state: { + some: 'state', + here: true, + }, +}; + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('POST /instance/:instanceId/plugins/:vId/command-executions/:id/state', () => { + describe('Validation', () => { + generateInvalidDataTestCases(dataSchema, validInputData).map( + validateInvalidDataTestCase(endpoint, dataSchema), + ); + }); + + describe('Common', () => { + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint( + constants.TEST_NOT_EXISTED_INSTANCE_ID, + constants.TEST_PLUGIN_VISUALIZATION_ID_1, + constants.TEST_NOT_EXISTED_INSTANCE_ID, + ), + statusCode: 404, + data: { + state: 'some state', + }, + responseBody: { + statusCode: 404, + message: 'Command execution was not found.', + error: 'Not Found' + }, + }, + { + name: 'Should set string', + data: { + state: 'some state', + }, + statusCode: 201, + checkFn: async ({ body }) => { + expect(body).to.eql({}); + const entity: any = await (await localDb.getRepository(localDb.repositories.PLUGIN_STATE)) + .findOne({ + commandExecutionId: constants.TEST_COMMAND_EXECUTION_ID_1, + visualizationId: constants.TEST_PLUGIN_VISUALIZATION_ID_1, + }); + + expect(entity.state).to.eql(localDb.encryptData(JSON.stringify('some state'))) + }, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1); + } + }, + { + name: 'Should set empty string', + data: { + state: '', + }, + statusCode: 201, + checkFn: async ({ body }) => { + expect(body).to.eql({}); + const entity: any = await (await localDb.getRepository(localDb.repositories.PLUGIN_STATE)) + .findOne({ + commandExecutionId: constants.TEST_COMMAND_EXECUTION_ID_1, + visualizationId: constants.TEST_PLUGIN_VISUALIZATION_ID_1, + }); + + expect(entity.state).to.eql(localDb.encryptData(JSON.stringify(''))) + }, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1); + } + }, + { + name: 'Should set null state', + data: { + state: null, + }, + statusCode: 201, + checkFn: async ({ body }) => { + expect(body).to.eql({}); + const entity: any = await (await localDb.getRepository(localDb.repositories.PLUGIN_STATE)) + .findOne({ + commandExecutionId: constants.TEST_COMMAND_EXECUTION_ID_1, + visualizationId: constants.TEST_PLUGIN_VISUALIZATION_ID_1, + }); + + expect(entity.state).to.eql(localDb.encryptData(JSON.stringify(null))) + }, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1); + } + }, + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl-get.test.ts b/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl-get.test.ts index f8373a542c..7955ba8be5 100644 --- a/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl-get.test.ts +++ b/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl-get.test.ts @@ -130,8 +130,8 @@ describe('POST /instance/:instanceId/rejson-rl/get', () => { }); describe('Large key value', () => { - // todo: do not forget to remove rte.name check after fixing MEMORY USAGE issue in RedisJSON v2.0.0 - requirements('rte.acl', '!rte.name=MODS_PREVIEW'); + // todo: do not forget to remove module version check after fixing MEMORY USAGE issue in RedisJSON v2.0.0 + requirements('rte.modules.rejson.version<20000'); [ { name: 'Should get json with calculated cardinality', @@ -180,8 +180,8 @@ describe('POST /instance/:instanceId/rejson-rl/get', () => { }) describe('ACL', () => { - // todo: do not forget to remove rte.name check after fixing MEMORY USAGE issue in RedisJSON v2.0.0 - requirements('rte.acl', '!rte.name=MODS_PREVIEW'); + // todo: do not forget to remove rte.modules.rejson check after fixing MEMORY USAGE issue in RedisJSON v2.0.0 + requirements('rte.acl', 'rte.modules.rejson.version<20000'); before(async () => rte.data.setAclUserRules('~* +@all')); [ diff --git a/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl.test.ts b/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl.test.ts index 7b7cad616d..d3f4be070b 100644 --- a/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl.test.ts +++ b/redisinsight/api/test/api/rejson-rl/POST-instance-id-rejson_rl.test.ts @@ -55,7 +55,11 @@ const mainCheckFn = async (testCase) => { expect(await rte.client.exists(testCase.data.keyName)).to.eql(1); expect(await rte.data.executeCommand('json.get', testCase.data.keyName, '.')) .to.deep.eql(testCase.data.data); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/api/sentinel/POST-sentinel-get_masters.test.ts b/redisinsight/api/test/api/sentinel/POST-sentinel-get_masters.test.ts new file mode 100644 index 0000000000..f980e4f5d5 --- /dev/null +++ b/redisinsight/api/test/api/sentinel/POST-sentinel-get_masters.test.ts @@ -0,0 +1,92 @@ +import { + Joi, + expect, + describe, + after, + deps, + requirements, + getMainCheckFn, + generateInvalidDataTestCases, + validateInvalidDataTestCase, +} from '../deps'; +const { request, server, constants, localDb } = deps; + +const endpoint = () => request(server).post('/sentinel/get-masters'); +const mainCheckFn = getMainCheckFn(endpoint); + +// input data schema +const dataSchema = Joi.object({ + host: Joi.string().required(), + port: Joi.number().required().allow(true), // todo: rework server transformer to not handle true like number:1 + username: Joi.string().allow(null), + password: Joi.string().allow(null), + tls: Joi.object({ + verifyServerCert: Joi.any(), // todo: rework server validation to not handle any value like boolean:true + caCertId: Joi.string().allow(null), + clientCertPairId: Joi.string().allow(null), + newCaCert: Joi.object({ + name: Joi.string(), + cert: Joi.string(), + }).allow(null), + newClientCertPair: Joi.object({ + name: Joi.string(), + key: Joi.string(), + cert: Joi.string(), + }).allow(null), + }).allow(null), +}).messages({ + 'any.required': '{#label} should not be empty', +}).strict(); + +const responseSchema = Joi.array().items(Joi.object().keys({ + host: Joi.string().required(), + port: Joi.number().required(), + name: Joi.string().required(), + status: Joi.string().required(), + numberOfSlaves: Joi.number().required(), + endpoints: Joi.array().items(Joi.object({ + host: Joi.string().required(), + port: Joi.number().required(), + })).required(), +})); + +const validInputData = { + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, +}; +describe('POST /sentinel/get-masters', () => { + requirements('rte.type=SENTINEL'); + after(localDb.initAgreements); + + describe('Validation', () => { + generateInvalidDataTestCases(dataSchema, validInputData).map( + validateInvalidDataTestCase(endpoint, dataSchema), + ); + }); + + describe('Common', () => { + [ + { + name: 'Get list of master groups', + data: { + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, + username: constants.TEST_REDIS_USER, + password: constants.TEST_REDIS_PASSWORD, + }, + responseSchema, + checkFn: async ({body}) => { + expect(body.length).to.eql(1); + expect(body[0].name).to.eql(constants.TEST_SENTINEL_MASTER_GROUP); + expect(body[0].endpoints).to.eql([ + { + host: constants.TEST_REDIS_HOST, + port: constants.TEST_REDIS_PORT, + }, + ]); + }, + }, + + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/set/POST-instance-id-set-get_members.test.ts b/redisinsight/api/test/api/set/POST-instance-id-set-get_members.test.ts index dd580c7c29..8a782796bb 100644 --- a/redisinsight/api/test/api/set/POST-instance-id-set-get_members.test.ts +++ b/redisinsight/api/test/api/set/POST-instance-id-set-get_members.test.ts @@ -220,6 +220,43 @@ describe('POST /instance/:instanceId/set/get-members', () => { expect(members.length).to.be.gte(100); expect(cursor).to.eql(0); }); + + describe('Search in huge number of elements', () => { + const ELEMENTS_NUMBER = 1_000_000; + + requirements('rte.bigData'); + [ + { + name: 'Should get element using exists without full scan', + data: { + keyName: constants.TEST_SET_HUGE_KEY, + cursor: 0, + match: constants.TEST_SET_HUGE_ELEMENT + }, + responseSchema, + responseBody: { + keyName: constants.TEST_SET_HUGE_KEY, + total: ELEMENTS_NUMBER, + members: [constants.TEST_SET_HUGE_ELEMENT], + nextCursor: 0, + }, + }, + { + name: 'Should get elements with possibility to continue iterating', + data: { + keyName: constants.TEST_SET_HUGE_KEY, + cursor: 0, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.keyName).to.eql(constants.TEST_SET_HUGE_KEY); + expect(body.total).to.eql(ELEMENTS_NUMBER); + expect(body.nextCursor).to.not.eql(0); + expect(body.members.length).to.gte(200); + }, + }, + ].map(mainCheckFn); + }); }); describe('ACL', () => { diff --git a/redisinsight/api/test/api/set/POST-instance-id-set.test.ts b/redisinsight/api/test/api/set/POST-instance-id-set.test.ts index 1782239572..d565c0273a 100644 --- a/redisinsight/api/test/api/set/POST-instance-id-set.test.ts +++ b/redisinsight/api/test/api/set/POST-instance-id-set.test.ts @@ -56,7 +56,11 @@ const mainCheckFn = async (testCase) => { const scanResult = await rte.client.sscan(testCase.data.keyName, 0, 'count', 100); expect(scanResult[0]).to.eql('0'); // full scan completed expect(scanResult[1]).to.eql(testCase.data.members); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/api/settings/PATCH-settings.test.ts b/redisinsight/api/test/api/settings/PATCH-settings.test.ts index 1533e9ccf0..75e6dfbe65 100644 --- a/redisinsight/api/test/api/settings/PATCH-settings.test.ts +++ b/redisinsight/api/test/api/settings/PATCH-settings.test.ts @@ -60,7 +60,8 @@ const mainCheckFn = async (testCase) => { }; describe('PATCH /settings', () => { - after(resetSettings) + after(initSettings); + describe('Validation', () => { generateInvalidDataTestCases(dataSchema, validInputData).map( validateInvalidDataTestCase(endpoint, dataSchema), @@ -69,7 +70,6 @@ describe('PATCH /settings', () => { describe('settings', () => { before(resetSettings); - after(initSettings); return ([ { @@ -112,7 +112,6 @@ describe('PATCH /settings', () => { describe('agreements', () => { before(resetSettings); - after(initSettings); const allAcceptedAgreements = {} Object.keys(AGREEMENTS_SPEC.agreements).forEach(agreement => allAcceptedAgreements[agreement] = true); diff --git a/redisinsight/api/test/api/string/POST-instance-id-string.test.ts b/redisinsight/api/test/api/string/POST-instance-id-string.test.ts index 65fb9eb4f7..841c67c214 100644 --- a/redisinsight/api/test/api/string/POST-instance-id-string.test.ts +++ b/redisinsight/api/test/api/string/POST-instance-id-string.test.ts @@ -52,7 +52,11 @@ const mainCheckFn = async (testCase) => { if (testCase.statusCode === 201) { expect(await rte.client.exists(testCase.data.keyName)).to.eql(1); expect(await rte.client.get(testCase.data.keyName)).to.eql(testCase.data.value); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/api/workbench/DELETE-instance-id-workbench-command_executions-id.test.ts b/redisinsight/api/test/api/workbench/DELETE-instance-id-workbench-command_executions-id.test.ts new file mode 100644 index 0000000000..4859cedcf8 --- /dev/null +++ b/redisinsight/api/test/api/workbench/DELETE-instance-id-workbench-command_executions-id.test.ts @@ -0,0 +1,67 @@ +import { + expect, + describe, + it, + deps, + validateApiCall, +} from '../deps'; +const { server, request, constants, rte, localDb } = deps; + +// endpoint to test +const endpoint = ( + instanceId = constants.TEST_INSTANCE_ID, + id = constants.TEST_COMMAND_EXECUTION_ID_1, +) => + request(server).delete(`/instance/${instanceId}/workbench/command-executions/${id}`); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('DELETE /instance/:instanceId/workbench/command-executions/:commandExecutionId', () => { + describe('Common', () => { + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint( + constants.TEST_NOT_EXISTED_INSTANCE_ID, + constants.TEST_COMMAND_EXECUTION_ID_1, + ), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Invalid database instance id.', + error: 'Not Found' + }, + }, + { + name: 'Should return 0 array when no history items yet', + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1); + }, + after: async () => { + expect(await (await (localDb.getRepository(localDb.repositories.COMMAND_EXECUTION))) + .findOne({ id: constants.TEST_COMMAND_EXECUTION_ID_1 })).to.eql(undefined); + }, + }, + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions-id.test.ts b/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions-id.test.ts new file mode 100644 index 0000000000..2cb0e4d5ff --- /dev/null +++ b/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions-id.test.ts @@ -0,0 +1,124 @@ +import { + expect, + describe, + it, + Joi, + deps, + validateApiCall, +} from '../deps'; +const { server, request, constants, rte, localDb } = deps; + +// endpoint to test +const endpoint = ( + instanceId = constants.TEST_INSTANCE_ID, + id = constants.TEST_COMMAND_EXECUTION_ID_1, +) => + request(server).get(`/instance/${instanceId}/workbench/command-executions/${id}`); + +const responseSchema = Joi.object().keys({ + id: Joi.string().required(), + databaseId: Joi.string().required(), + command: Joi.string().required().allow(null), + result: Joi.array().items(Joi.object({ + response: Joi.any().required(), + status: Joi.string().required(), + node: Joi.object({ + host: Joi.string().required(), + port: Joi.number().required(), + slot: Joi.number(), + }), + })).allow(null), + role: Joi.string().allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + port: Joi.number().required(), + enableRedirection: Joi.boolean().required(), + }).allow(null), + createdAt: Joi.date().required(), +}).required(); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('GET /instance/:instanceId/workbench/command-executions/:commandExecutionId', () => { + describe('Common', () => { + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint( + constants.TEST_NOT_EXISTED_INSTANCE_ID, + constants.TEST_COMMAND_EXECUTION_ID_1, + ), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Invalid database instance id.', + error: 'Not Found' + }, + }, + { + name: 'Should return 404 not found when incorrect command execution id', + endpoint: () => endpoint( + constants.TEST_INSTANCE_ID, + constants.TEST_INSTANCE_ID, + ), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Command execution was not found.', + error: 'Not Found' + }, + }, + { + name: 'Should return 0 array when no history items yet', + responseSchema, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID + }, 100, true); + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + }, 1); + }, + checkFn: async ({ body }) => { + expect(body.id).to.eql(constants.TEST_COMMAND_EXECUTION_ID_1); + }, + }, + { + name: 'Should return null in the command and result when unable to decrypt', + responseSchema, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + id: constants.TEST_COMMAND_EXECUTION_ID_1, + command: 'badencryption', + result: 'badencryption', + encryption: 'KEYTAR', + }, 1); + }, + checkFn: async ({ body }) => { + expect(body.id).to.eql(constants.TEST_COMMAND_EXECUTION_ID_1); + expect(body.command).to.eql(null); + expect(body.result).to.eql(null); + }, + }, + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions.test.ts b/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions.test.ts new file mode 100644 index 0000000000..d3e222729f --- /dev/null +++ b/redisinsight/api/test/api/workbench/GET-instance-id-workbench-command_executions.test.ts @@ -0,0 +1,108 @@ +import { + expect, + describe, + it, + Joi, + deps, + validateApiCall, +} from '../deps'; +const { server, request, constants, localDb } = deps; + +// endpoint to test +const endpoint = (instanceId = constants.TEST_INSTANCE_ID) => + request(server).get(`/instance/${instanceId}/workbench/command-executions`); + +const responseSchema = Joi.array().items(Joi.object().keys({ + id: Joi.string().required(), + databaseId: Joi.string().required(), + command: Joi.string().required(), + role: Joi.string().allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + port: Joi.number().required(), + enableRedirection: Joi.boolean().required(), + }).allow(null), + createdAt: Joi.date().required(), +})).required().max(30); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('GET /instance/:instanceId/workbench/command-executions', () => { + describe('Common', () => { + [ + { + name: 'Should return 0 array when no history items yet', + responseSchema, + before: async () => { + await (await localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)).clear(); + }, + checkFn: async ({ body }) => { + expect(body).to.eql([]); + }, + }, + { + name: 'Should get only 30 items', + responseSchema, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID + }, 100, true); + }, + checkFn: async ({ body }) => { + expect(body.length).to.eql(30); + for (let i = 0; i < 30; i ++) { + expect(body[i].command).to.eql('set foo bar'); + } + }, + }, + { + name: 'Should return only 10 items that we are able to decrypt', + responseSchema, + before: async () => { + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID + }, 10, true); + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + command: 'invalidaencrypted', + encryption: 'KEYTAR', + }, 10); + }, + checkFn: async ({ body }) => { + expect(body.length).to.eql(10); + + for (let i = 0; i < 10; i ++) { + expect(body[i].command).to.eql('set foo bar'); + } + }, + }, + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint(constants.TEST_NOT_EXISTED_INSTANCE_ID), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Invalid database instance id.', + error: 'Not Found' + }, + }, + ].map(mainCheckFn); + }); +}); diff --git a/redisinsight/api/test/api/workbench/POST-instance-id-workbench-command_executions.test.ts b/redisinsight/api/test/api/workbench/POST-instance-id-workbench-command_executions.test.ts new file mode 100644 index 0000000000..a9d8405bbe --- /dev/null +++ b/redisinsight/api/test/api/workbench/POST-instance-id-workbench-command_executions.test.ts @@ -0,0 +1,1176 @@ +import { + expect, + before, + describe, + it, + Joi, + _, + deps, + generateInvalidDataTestCases, + validateInvalidDataTestCase, + validateApiCall, + requirements, +} from '../deps'; +const { server, request, constants, rte, localDb } = deps; + +// endpoint to test +const endpoint = (instanceId = constants.TEST_INSTANCE_ID) => + request(server).post(`/instance/${instanceId}/workbench/command-executions`); + +// input data schema +const dataSchema = Joi.object({ + command: Joi.string().required(), + role: Joi.string().valid('ALL', 'MASTER', 'SLAVE').allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + // todo: fix BE transform to avoid handle boolean as number + port: Joi.number().required().allow(true), + enableRedirection: Joi.boolean().required().messages({ + 'any.required': '{#label} should not be null or undefined', + }), + }).allow(null), +}).messages({ + 'any.required': '{#label} should not be empty', +}).strict(); + +const validInputData = { + command: 'set foo bar', + role: 'ALL', + nodeOptions: { + host: 'localhost', + port: 6379, + enableRedirection: true, + } +}; + +const responseSchema = Joi.object().keys({ + id: Joi.string().required(), + databaseId: Joi.string().required(), + command: Joi.string().required(), + result: Joi.array().items(Joi.object({ + response: Joi.any().required(), + status: Joi.string().required(), + node: Joi.object({ + host: Joi.string().required(), + port: Joi.number().required(), + slot: Joi.number(), + }), + })), + role: Joi.string().allow(null), + nodeOptions: Joi.object().keys({ + host: Joi.string().required(), + port: Joi.number().required(), + enableRedirection: Joi.boolean().required(), + }).allow(null), + createdAt: Joi.date().required(), +}).required(); + +const mainCheckFn = async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +describe('POST /instance/:instanceId/workbench/command-executions', () => { + before(rte.data.truncate); + + describe('Validation', () => { + generateInvalidDataTestCases(dataSchema, validInputData).map( + validateInvalidDataTestCase(endpoint, dataSchema), + ); + }); + + describe('Common', () => { + describe('String', () => { + const bigStringValue = Buffer.alloc(1023 * 1024, 'a').toString(); + + [ + { + name: 'Should return 404 not found when incorrect instance', + endpoint: () => endpoint(constants.TEST_NOT_EXISTED_INSTANCE_ID), + statusCode: 404, + responseBody: { + statusCode: 404, + message: 'Invalid database instance id.', + error: 'Not Found' + }, + }, + { + name: 'Should get string', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.command).to.eql(`get ${constants.TEST_STRING_KEY_1}`); + expect(body.role).to.eql(null); + expect(body.result.length).to.eql(1); + expect(body.result[0].response).to.eql(bigStringValue); + expect(body.result[0].status).to.eql('success'); + + const entity: any = await (await localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)).findOne({ + id: body.id, + }); + + expect(entity.encryption).to.eql(constants.TEST_ENCRYPTION_STRATEGY); + expect(localDb.encryptData(body.command)).to.eql(entity.command); + expect(localDb.encryptData(JSON.stringify(body.result))).to.eql(entity.result); + }, + before: async () => { + expect(await rte.client.set(constants.TEST_STRING_KEY_1, bigStringValue)); + } + }, + { + name: 'Should remove string', + data: { + command: `del ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_STRING_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('Big String', () => { + const bigStringValue = Buffer.alloc(1024 * 1024, 'a').toString(); + + [ + { + name: 'Should create string', + data: { + command: `set ${constants.TEST_STRING_KEY_1} ${bigStringValue}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_STRING_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.get(constants.TEST_STRING_KEY_1)).to.eql(bigStringValue); + } + }, + { + name: 'Should get string', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.command).to.eql(`get ${constants.TEST_STRING_KEY_1}`); + expect(body.role).to.eql(null); + expect(body.result.length).to.eql(1); + expect(body.result[0].response).to.eql(bigStringValue); + expect(body.result[0].status).to.eql('success'); + + const entity: any = await (await localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)).findOne({ + id: body.id, + }); + + expect(entity.encryption).to.eql(constants.TEST_ENCRYPTION_STRATEGY); + expect(localDb.encryptData(body.command)).to.eql(entity.command); + expect(localDb.encryptData(JSON.stringify([{ + status: 'success', + response: 'Results have been deleted since they exceed 1 MB. Re-run the command to see new results.', + }]))).to.eql(entity.result); + } + }, + { + name: 'Should remove string', + data: { + command: `del ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_STRING_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('List', () => { + [ + { + name: 'Should create list', + data: { + command: `lpush ${constants.TEST_LIST_KEY_1} ${constants.TEST_LIST_ELEMENT_1} ${constants.TEST_LIST_ELEMENT_2}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_LIST_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.lrange(constants.TEST_LIST_KEY_1, 0, 100)).to.eql([ + constants.TEST_LIST_ELEMENT_2, + constants.TEST_LIST_ELEMENT_1, + ]); + } + }, + { + name: 'Should get list', + data: { + command: `lrange ${constants.TEST_LIST_KEY_1} 0 100`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: [ + constants.TEST_LIST_ELEMENT_2, + constants.TEST_LIST_ELEMENT_1, + ] + }, + ]); + + const entity: any = await (await localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)).findOne({ + id: body.id, + }); + + expect(entity.encryption).to.eql(constants.TEST_ENCRYPTION_STRATEGY); + expect(localDb.encryptData(body.command)).to.eql(entity.command); + expect(localDb.encryptData(JSON.stringify(body.result))).to.eql(entity.result); + } + }, + { + name: 'Should remove list', + data: { + command: `del ${constants.TEST_LIST_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_LIST_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('Set', () => { + [ + { + name: 'Should create set', + data: { + command: `sadd ${constants.TEST_SET_KEY_1} ${constants.TEST_SET_MEMBER_1} ${constants.TEST_SET_MEMBER_2}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_SET_KEY_1)).to.eql(0); + }, + after: async () => { + const [cursor, set] = await rte.client.sscan(constants.TEST_SET_KEY_1, 0); + expect(cursor).to.eql('0'); + expect(set.length).to.eql(2); + expect(set.join()).to.include(constants.TEST_SET_MEMBER_1); + expect(set.join()).to.include(constants.TEST_SET_MEMBER_2); + }, + }, + { + name: 'Should get set', + data: { + command: `sscan ${constants.TEST_SET_KEY_1} 0 count 100`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response[0]).to.eql('0'); // 0 cursor + // Check for members. No order guaranteed + expect(body.result[0].response[1]).to.include(constants.TEST_SET_MEMBER_1); + expect(body.result[0].response[1]).to.include(constants.TEST_SET_MEMBER_2); + } + }, + { + name: 'Should get set (multiline)', + data: { + command: `sscan\n ${constants.TEST_SET_KEY_1} 0\n count\n 100`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.command).to.eql(`sscan\n ${constants.TEST_SET_KEY_1} 0\n count\n 100`); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response[0]).to.eql('0'); // 0 cursor + // Check for members. No order guaranteed + expect(body.result[0].response[1]).to.include(constants.TEST_SET_MEMBER_1); + expect(body.result[0].response[1]).to.include(constants.TEST_SET_MEMBER_2); + } + }, + { + name: 'Should remove list', + data: { + command: `del ${constants.TEST_SET_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_SET_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('ZSet', () => { + [ + { + name: 'Should create zset', + data: { + command: `zadd ${constants.TEST_ZSET_KEY_1} 1 ${constants.TEST_ZSET_MEMBER_1} 2 ${constants.TEST_ZSET_MEMBER_2}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_ZSET_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.zrange(constants.TEST_ZSET_KEY_1, 0, 100)).to.deep.eql([ + constants.TEST_ZSET_MEMBER_1, + constants.TEST_ZSET_MEMBER_2, + ]); + }, + }, + { + name: 'Should get zset', + data: { + command: `zrange ${constants.TEST_ZSET_KEY_1} 0 100`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql( + [ + { + status: 'success', + response: [ + constants.TEST_ZSET_MEMBER_1, + constants.TEST_ZSET_MEMBER_2, + ], + }, + ] + ); + } + }, + { + name: 'Should remove zset', + data: { + command: `del ${constants.TEST_ZSET_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_ZSET_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('Hash', () => { + [ + { + name: 'Should create hash', + data: { + command: `hset ${constants.TEST_HASH_KEY_1} ${constants.TEST_HASH_FIELD_1_NAME} ${constants.TEST_HASH_FIELD_1_VALUE}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_HASH_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.hgetall(constants.TEST_HASH_KEY_1)).to.deep.eql({ + [constants.TEST_HASH_FIELD_1_NAME]: constants.TEST_HASH_FIELD_1_VALUE, + }); + }, + }, + { + name: 'Should get hash', + data: { + command: `hgetall ${constants.TEST_HASH_KEY_1}`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: { + [constants.TEST_HASH_FIELD_1_NAME]: constants.TEST_HASH_FIELD_1_VALUE, + }, + }, + ]); + } + }, + { + name: 'Should remove hash', + data: { + command: `del ${constants.TEST_HASH_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_HASH_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('ReJSON-RL', () => { + requirements('rte.modules.rejson'); + [ + { + name: 'Should create json', + data: { + command: `json.set ${constants.TEST_REJSON_KEY_1} . "{\\"field\\":\\"value\\"}"`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_REJSON_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.data.executeCommand('json.get', constants.TEST_REJSON_KEY_1, '.')).to.eql('{"field":"value"}'); + }, + }, + { + name: 'Should get json', + data: { + command: `json.get ${constants.TEST_REJSON_KEY_1} .field`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: '"value"' + }, + ]); + } + }, + { + name: 'Should remove json', + data: { + command: `json.del ${constants.TEST_REJSON_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_REJSON_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('TSDB-TYPE', () => { + requirements('rte.modules.timeseries'); + [ + { + name: 'Should create ts', + data: { + command: `ts.create ${constants.TEST_TS_KEY_1} ${constants.TEST_TS_VALUE_1} ${constants.TEST_TS_VALUE_2}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_TS_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.exists(constants.TEST_TS_KEY_1)).to.eql(1); + }, + }, + { + name: 'Should add to ts', + data: { + command: `ts.add ${constants.TEST_TS_KEY_1} ${constants.TEST_TS_TIMESTAMP_1} ${constants.TEST_TS_VALUE_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.data.executeCommand('ts.get', constants.TEST_TS_KEY_1)).to.eql([ + constants.TEST_TS_TIMESTAMP_1, + constants.TEST_TS_VALUE_1.toString(), + ]); + }, + }, + { + name: 'Should get ts', + data: { + command: `ts.get ${constants.TEST_TS_KEY_1}`, + outputFormat: 'TEXT', + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: [ + constants.TEST_TS_TIMESTAMP_1, + constants.TEST_TS_VALUE_1.toString(), + ] + }, + ]); + } + }, + { + name: 'Should remove ts', + data: { + command: `del ${constants.TEST_TS_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_TS_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('Graph', () => { + requirements('rte.modules.graph'); + [ + { + name: 'Should create graph', + data: { + command: `graph.query ${constants.TEST_GRAPH_KEY_1} "CREATE (n1)"`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response[0]).to.include('Nodes created: 1'); + }, + before: async () => { + expect(await rte.client.exists(constants.TEST_GRAPH_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.exists(constants.TEST_GRAPH_KEY_1)).to.eql(1); + }, + }, + { + name: 'Should get graph', + data: { + command: `graph.query ${constants.TEST_GRAPH_KEY_1} "MATCH (n1) RETURN n1"`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response[0]).to.eql(['n1']); + expect(body.result[0].response[1]).to.be.an('array'); + expect(body.result[0].response[2][0]).to.eql('Cached execution: 0'); + expect(body.result[0].response[2][1]).to.have.string('Query internal execution time:'); + } + }, + { + name: 'Should remove graph', + data: { + command: `del ${constants.TEST_GRAPH_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_GRAPH_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('RediSearch v2', () => { + describe('Hash', () => { + requirements('rte.modules.search', 'rte.modules.search.version>=20000'); + [ + { + name: 'Should create index', + data: { + command: `ft.create ${constants.TEST_SEARCH_HASH_INDEX_1} ON HASH + PREFIX 1 ${constants.TEST_SEARCH_HASH_KEY_PREFIX_1} NOOFFSETS SCHEMA title TEXT WEIGHT 5.0`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: 'OK', + }, + ]); + }, + before: async () => { + expect(await rte.client.send_command('ft._list')).to.not.include(constants.TEST_SEARCH_HASH_INDEX_1); + }, + after: async () => { + expect(await rte.client.send_command(`ft._list`)).to.include(constants.TEST_SEARCH_HASH_INDEX_1); + }, + }, + { + name: 'Should return the list of all existing indexes.', + data: { + command: `ft._list`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: [constants.TEST_SEARCH_HASH_INDEX_1], + }, + ]); + }, + }, + { + name: 'Should return index info', + data: { + command: `ft.info ${constants.TEST_SEARCH_HASH_INDEX_1}`, + }, + responseSchema, + checkFn: ({ body }) => { + const response = body.result[0].response; + + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(response[0]).to.eql('index_name'); + expect(response[1]).to.eql(constants.TEST_SEARCH_HASH_INDEX_1); + expect(response[2]).to.eql('index_options'); + expect(response[3]).to.eql(['NOOFFSETS']); + expect(response[4]).to.eql('index_definition'); + expect(_.take(response[5], 4)).to.eql( ['key_type', 'HASH', 'prefixes', [constants.TEST_SEARCH_HASH_KEY_PREFIX_1]]); + }, + }, + { + name: 'Should find documents', + data: { + command: `ft.search ${constants.TEST_SEARCH_HASH_INDEX_1} "hello world"`, + }, + responseSchema, + before: async () => { + for (let i = 0; i < 10; i++) { + await rte.client.hset(`${constants.TEST_SEARCH_HASH_KEY_PREFIX_1}${i}`, 'title', `hello world ${i}`) + } + }, + checkFn: ({ body }) => { + const response: any[] = [10]; + + for (let i = 0; i < 10; i++) { + response.push( + `${constants.TEST_SEARCH_HASH_KEY_PREFIX_1}${i}`, + ['title', `hello world ${i}`], + ); + } + + expect(body.result).to.eql([ + { + status: 'success', + response, + }, + ]); + } + }, + { + name: 'Should aggregate documents by uniq @title', + data: { + command: `ft.aggregate ${constants.TEST_SEARCH_HASH_INDEX_1} * GROUPBY 1 @title`, + }, + responseSchema, + checkFn: ({ body }) => { + const response = body.result[0].response; + + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(response[0]).to.eql(10); + expect(response).to.deep.include(['title', 'hello world 1']); + } + }, + { + name: 'Should remove index', + data: { + command: `ft.dropindex ${constants.TEST_SEARCH_HASH_INDEX_1} DD`, + }, + responseSchema, + after: async () => { + expect(await rte.client.send_command('ft._list')).to.not.include(constants.TEST_SEARCH_HASH_INDEX_1); + } + }, + ].map(mainCheckFn); + }) + describe('JSON', () => { + requirements( + 'rte.modules.search', + 'rte.modules.rejson', + 'rte.modules.search.version>=20200', + 'rte.modules.rejson>=20000' + ); + [ + { + name: 'Should create index', + data: { + command: `ft.create ${constants.TEST_SEARCH_JSON_INDEX_1} ON JSON + PREFIX 1 ${constants.TEST_SEARCH_JSON_KEY_PREFIX_1} + NOOFFSETS SCHEMA $.user.name AS name TEXT`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result).to.eql([ + { + status: 'success', + response: 'OK', + }, + ]); + }, + before: async () => { + expect(await rte.client.send_command('ft._list')).to.not.include(constants.TEST_SEARCH_JSON_INDEX_1); + }, + after: async () => { + expect(await rte.client.send_command(`ft._list`)).to.include(constants.TEST_SEARCH_JSON_INDEX_1); + }, + }, + { + name: 'Should return index info', + data: { + command: `ft.info ${constants.TEST_SEARCH_JSON_INDEX_1}`, + }, + responseSchema, + checkFn: ({ body }) => { + const response = body.result[0].response; + + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(response[0]).to.eql('index_name'); + expect(response[1]).to.eql(constants.TEST_SEARCH_JSON_INDEX_1); + expect(response[2]).to.eql('index_options'); + expect(response[3]).to.eql(['NOOFFSETS']); + expect(response[4]).to.eql('index_definition'); + expect(_.take(response[5], 4)).to.eql( ['key_type', 'JSON', 'prefixes', [ constants.TEST_SEARCH_JSON_KEY_PREFIX_1 ]]); + }, + }, + { + name: 'Should find documents', + data: { + command: `ft.search ${constants.TEST_SEARCH_JSON_INDEX_1} "@name:(John)"`, + }, + responseSchema, + before: async () => { + for (let i = 0; i < 10; i++) { + await rte.client.send_command( + 'json.set', + [`${constants.TEST_SEARCH_JSON_KEY_PREFIX_1}${i}`, '$', `{"user":{"name":"John Smith${i}"}}`] + ) + } + }, + checkFn: ({ body }) => { + const response: any[] = [10]; + + for (let i = 0; i < 10; i++) { + response.push( + `${constants.TEST_SEARCH_JSON_KEY_PREFIX_1}${i}`, + ['$', `{"user":{"name":"John Smith${i}"}}`], + ); + } + + expect(body.result).to.eql([ + { + status: 'success', + response, + }, + ]); + } + }, + { + name: 'Should aggregate documents by uniq @name', + data: { + command: `ft.aggregate ${constants.TEST_SEARCH_JSON_INDEX_1} * GROUPBY 1 @name`, + }, + responseSchema, + checkFn: ({ body }) => { + const response = body.result[0].response; + + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(response[0]).to.eql(10); + expect(response).to.deep.include(['name', 'John Smith0']); + } + }, + { + name: 'Should remove index', + data: { + command: `ft.dropindex ${constants.TEST_SEARCH_JSON_INDEX_1} DD`, + }, + responseSchema, + after: async () => { + expect(await rte.client.send_command('ft._list')).to.not.include(constants.TEST_SEARCH_JSON_INDEX_1); + } + }, + ].map(mainCheckFn); + }) + }); + describe('Stream', () => { + requirements('rte.version>=5.0'); + [ + { + name: 'Should create stream', + data: { + command: `xadd ${constants.TEST_STREAM_KEY_1} * ${constants.TEST_STREAM_DATA_1} ${constants.TEST_STREAM_DATA_2}`, + }, + responseSchema, + before: async () => { + expect(await rte.client.exists(constants.TEST_STREAM_KEY_1)).to.eql(0); + }, + after: async () => { + expect(await rte.client.exists(constants.TEST_STREAM_KEY_1)).to.eql(1); + }, + }, + { + name: 'Should get stream', + data: { + command: `xrange ${constants.TEST_STREAM_KEY_1} - +`, + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response[0][0]).to.have.string('-'); + expect(body.result[0].response[0][1]).to.eql([ + constants.TEST_STREAM_DATA_1, + constants.TEST_STREAM_DATA_2, + ]); + } + }, + { + name: 'Should remove stream', + data: { + command: `del ${constants.TEST_STREAM_KEY_1}`, + }, + responseSchema, + after: async () => { + expect(await rte.client.exists(constants.TEST_STREAM_KEY_1)).to.eql(0); + } + }, + ].map(mainCheckFn); + }); + describe('Bad commands', () => { + [ + { + name: 'Should return error if invalid command sent', + data: { + command: `setx ${constants.TEST_STRING_KEY_1} ${constants.TEST_STRING_VALUE_1}`, + }, + checkFn: ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('fail'); + expect(body.result[0].response).to.include('ERR unknown command'); + }, + }, + { + name: 'Should return error if try to run unsupported command (monitor)', + data: { + command: `monitor`, + }, + }, + { + name: 'Should return error if try to run unsupported command (subscribe)', + data: { + command: `subscribe`, + }, + }, + { + name: 'Should return error if try to run unsupported command (psubscribe)', + data: { + command: `psubscribe`, + }, + }, + { + name: 'Should return error if try to run unsupported command (sync)', + data: { + command: `sync`, + }, + }, + { + name: 'Should return error if try to run unsupported command (psync)', + data: { + command: `psync`, + }, + }, + { + name: 'Should return error if try to run unsupported command (script debug)', + data: { + command: `script debug`, + }, + }, + { + name: 'Should return error if try to run blocking command', + data: { + command: `blpop key`, + }, + }, + ].map((testCase) => mainCheckFn({ + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.result[0].status).to.eql('fail'); + expect(body.result[0].response).to.include('command is not supported by the RedisInsight Workbench'); + }, + ...testCase, + })); + }); + describe('History items limit', () => { + it('Number of history items should be less then 30', async () => { + const repo = await (localDb.getRepository(localDb.repositories.COMMAND_EXECUTION)); + await localDb.generateNCommandExecutions({ + databaseId: constants.TEST_INSTANCE_ID, + createdAt: new Date(Date.now() - 1000) + }, 30, true); + + for (let i = 0; i < 40; i++) { + await validateApiCall( { + endpoint, + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + + const count = await repo.count({ databaseId: constants.TEST_INSTANCE_ID }); + expect(count).to.lte(30); + + // check that the last execution command was not deleted + // await repo.findOneOrFail({ id: body.id }); // sometimes localDb is not in sync. investigate + }, + }); + } + }); + }); + }); + describe('Standalone + Sentinel', () => { + requirements('!rte.type=CLUSTER'); + + describe('Incorrect requests for redis client type', () => { + [ + { + name: 'Should return error if try to execute command for role for standalone database', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'ALL', + }, + statusCode: 400, + responseBody: { + statusCode: 400, + error: 'Bad Request', + message: 'Wrong database type.', + }, + }, + { + name: 'Should return error if try to execute command for particular node for standalone database', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + host: 'localhost', + port: 6379, + enableRedirection: true, + } + }, + statusCode: 400, + responseBody: { + statusCode: 400, + error: 'Bad Request', + message: 'Wrong database type.', + }, + }, + ].map(mainCheckFn); + }); + }); + describe('Cluster', () => { + requirements('rte.type=CLUSTER'); + requirements('!rte.re'); + + let database; + let nodes; + + before(async () => { + database = await (await localDb.getRepository(localDb.repositories.INSTANCE)).findOne({ + id: constants.TEST_INSTANCE_ID, + }); + nodes = JSON.parse(database.nodes); + }); + + describe('Commands using role', () => { + [ + { + name: 'Get command with role=ALL', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'ALL', + }, + responseSchema, + before: async () => { + await rte.client.set(constants.TEST_STRING_KEY_1, constants.TEST_STRING_VALUE_1); + }, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.eql(nodes.length); + expect(body.role).to.eql('ALL'); + expect(body.nodeOptions).to.eql(undefined); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gt(0); + expect(resultSummary.succeed).to.gt(0); + expect(resultSummary.moved + resultSummary.succeed).to.eq(nodes.length) + }, + }, + { + name: 'Get command with role=MASTER', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + role: 'MASTER', + }, + responseSchema, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.lte(nodes.length); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gt(0); + expect(resultSummary.succeed).to.gt(0); + expect(resultSummary.moved + resultSummary.succeed).to.lte(nodes.length) + }, + }, + { + name: 'Set command with role=SLAVE should return all failed responses', + data: { + command: `set ${constants.TEST_STRING_KEY_1} ${constants.TEST_STRING_KEY_1}`, + role: 'SLAVE', + }, + responseSchema, + checkFn: async ({ body }) => { + const result = body.result; + + expect(result.length).to.lte(nodes.length); + + const resultSummary = { + moved: 0, + succeed: 0, + }; + + result.forEach(nodeResult => { + const node = nodes.find(node => { + return nodeResult.node.host === node.host && nodeResult.node.port === node.port; + }); + + if (!node) { + fail(`Unexpected node detected: ${JSON.stringify(nodeResult.node)}`); + } + + switch (nodeResult.status) { + case 'fail': + expect(nodeResult.response).to.have.string('MOVED'); + resultSummary.moved++; + break; + case 'success': + expect(nodeResult.response).to.eql(constants.TEST_STRING_VALUE_1); + resultSummary.succeed++; + break; + default: + fail(`Unexpected node result status: ${nodeResult.status}`); + } + }); + + expect(resultSummary.moved).to.gte(0); + expect(resultSummary.succeed).to.eq(0); + expect(resultSummary.moved + resultSummary.succeed).to.lte(nodes.length) + }, + }, + ].map(mainCheckFn); + }); + describe('Commands using nodeOptions', () => { + [ + { + name: 'Incorrect node should return an error', + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + host: 'unreachable', + port: 6380, + enableRedirection: true, + }, + }, + statusCode: 400, + responseBody: { + statusCode: 400, + message: 'Node unreachable:6380 not exist in OSS Cluster.', + error: 'Bad Request' + }, + before: async () => { + await rte.client.set(constants.TEST_STRING_KEY_1, constants.TEST_STRING_VALUE_1); + }, + }, + ].map(mainCheckFn); + + it('Should auto redirect and never fail', async () => { + await validateApiCall( { + endpoint, + data: { + command: `get ${constants.TEST_STRING_KEY_1}`, + nodeOptions: { + ...nodes[0], + enableRedirection: true, + }, + }, + responseSchema, + checkFn: async ({ body }) => { + expect(body.result.length).to.eql(1); + expect(body.role).to.eql(null); + expect(body.nodeOptions).to.eql({ + ...nodes[0], + enableRedirection: true, + }); + expect(body.result[0].status).to.eql('success'); + expect(body.result[0].response).to.eql(constants.TEST_STRING_VALUE_1); + }, + }); + }); + }); + }); +}); diff --git a/redisinsight/api/test/api/z-set/POST-instance-id-zSet-search.test.ts b/redisinsight/api/test/api/z-set/POST-instance-id-zSet-search.test.ts index 5a504a0041..e686638fb3 100644 --- a/redisinsight/api/test/api/z-set/POST-instance-id-zSet-search.test.ts +++ b/redisinsight/api/test/api/z-set/POST-instance-id-zSet-search.test.ts @@ -204,6 +204,48 @@ describe('POST /instance/:instanceId/zSet/search', () => { }, }, ].map(mainCheckFn); + + + describe('Search in huge number of elements', () => { + const ELEMENTS_NUMBER = 1_000_000; + + requirements('rte.bigData'); + [ + { + name: 'Should get member using "exists" cmd without full scan', + data: { + keyName: constants.TEST_ZSET_HUGE_KEY, + cursor: 0, + match: constants.TEST_ZSET_HUGE_MEMBER + }, + responseSchema, + responseBody: { + keyName: constants.TEST_ZSET_HUGE_KEY, + total: ELEMENTS_NUMBER, + members: [{ + name: constants.TEST_ZSET_HUGE_MEMBER, + score: constants.TEST_ZSET_HUGE_SCORE, + }], + nextCursor: 0, + }, + }, + { + name: 'Should get elements with possibility to continue iterating', + data: { + keyName: constants.TEST_ZSET_HUGE_KEY, + cursor: 0, + match: '*', + }, + responseSchema, + checkFn: ({ body }) => { + expect(body.keyName).to.eql(constants.TEST_ZSET_HUGE_KEY); + expect(body.total).to.eql(ELEMENTS_NUMBER); + expect(body.nextCursor).to.not.eql(0); + expect(body.members.length).to.gte(200); + }, + }, + ].map(mainCheckFn); + }); }); describe('ACL', () => { diff --git a/redisinsight/api/test/api/z-set/POST-instance-id-zSet.test.ts b/redisinsight/api/test/api/z-set/POST-instance-id-zSet.test.ts index 4878d72fe5..ac783bad10 100644 --- a/redisinsight/api/test/api/z-set/POST-instance-id-zSet.test.ts +++ b/redisinsight/api/test/api/z-set/POST-instance-id-zSet.test.ts @@ -63,7 +63,11 @@ const mainCheckFn = async (testCase) => { if (testCase.statusCode === 201) { expect(await rte.client.exists(testCase.data.keyName)).to.eql(1); expect(await rte.client.zrange(testCase.data.keyName, 0, 10)).to.eql([testCase.data.members[0].name]); - expect(await rte.client.ttl(testCase.data.keyName)).to.eql(testCase.data.expire || -1); + if (testCase.data.expire) { + expect(await rte.client.ttl(testCase.data.keyName)).to.gte(testCase.data.expire - 5); + } else { + expect(await rte.client.ttl(testCase.data.keyName)).to.eql(-1); + } } } }); diff --git a/redisinsight/api/test/helpers/constants.ts b/redisinsight/api/test/helpers/constants.ts index 6f7881e375..2d7dee7d39 100644 --- a/redisinsight/api/test/helpers/constants.ts +++ b/redisinsight/api/test/helpers/constants.ts @@ -1,7 +1,7 @@ import { v4 as uuidv4 } from 'uuid'; import { randomBytes } from 'crypto'; -const TEST_RUN_ID = uuidv4(); +const TEST_RUN_ID = `=${uuidv4()}`; const KEY_TTL = 100; const CLUSTER_HASH_SLOT = '{slot1}'; const APP_DEFAULT_SETTINGS = { @@ -16,7 +16,8 @@ export const constants = { TEST_RUN_NAME: process.env.TEST_RUN_NAME || '', KEY_TTL, CLUSTER_HASH_SLOT, - getRandomString: () => TEST_RUN_ID + '_' + uuidv4(), + getRandomString: () => `${TEST_RUN_ID}_${uuidv4()}_${CLUSTER_HASH_SLOT}`, + generateRandomKey: () => `${TEST_RUN_ID}_${uuidv4()}_${CLUSTER_HASH_SLOT}`, APP_DEFAULT_SETTINGS, TEST_KEYTAR_PASSWORD: process.env.SECRET_STORAGE_PASSWORD || 'somepassword', TEST_ENCRYPTION_STRATEGY: 'KEYTAR', @@ -51,6 +52,8 @@ export const constants = { TEST_USER_TLS_KEY: process.env.TEST_USER_TLS_KEY, TEST_RTE_ON_PREMISE: process.env.TEST_RTE_ON_PREMISE ? process.env.TEST_RTE_ON_PREMISE === 'true' : true, + TEST_RTE_SHARED_DATA: process.env.TEST_RTE_SHARED_DATA ? process.env.TEST_RTE_SHARED_DATA === 'true' : false, + TEST_RTE_BIG_DATA: process.env.TEST_RTE_BIG_DATA ? process.env.TEST_RTE_BIG_DATA === 'true' : false, TEST_RTE_TYPE: process.env.TEST_RTE_DISCOVERY_TYPE || 'STANDALONE', TEST_RTE_HOST: process.env.TEST_RTE_DISCOVERY_HOST, TEST_RTE_PORT: process.env.TEST_RTE_DISCOVERY_PORT, @@ -113,6 +116,9 @@ export const constants = { TEST_LIST_ELEMENT_2: TEST_RUN_ID + '_list_el_2', TEST_LIST_EXPIRE_1: KEY_TTL, TEST_LIST_KEY_2: TEST_RUN_ID + '_list_2' + CLUSTER_HASH_SLOT, + TEST_LIST_HUGE_KEY: 'big list 1M', + TEST_LIST_HUGE_INDEX: 678900, + TEST_LIST_HUGE_ELEMENT: ' 321099', // Redis Set TEST_SET_TYPE: 'set', @@ -121,6 +127,8 @@ export const constants = { TEST_SET_MEMBER_2: TEST_RUN_ID + '_set_mem_2', TEST_SET_EXPIRE_1: KEY_TTL, TEST_SET_KEY_2: TEST_RUN_ID + '_set_2' + CLUSTER_HASH_SLOT, + TEST_SET_HUGE_KEY: 'big set 1M', + TEST_SET_HUGE_ELEMENT: ' 356897', // Redis ZSet TEST_ZSET_TYPE: 'zset', @@ -132,6 +140,9 @@ export const constants = { TEST_ZSET_EXPIRE_1: KEY_TTL, TEST_ZSET_KEY_2: TEST_RUN_ID + '_zset_2' + CLUSTER_HASH_SLOT, TEST_ZSET_KEY_3: TEST_RUN_ID + '_zset_3' + CLUSTER_HASH_SLOT, + TEST_ZSET_HUGE_KEY: 'big zset 1M', + TEST_ZSET_HUGE_MEMBER: ' 356897', + TEST_ZSET_HUGE_SCORE: '356897', // Redis Hash TEST_HASH_TYPE: 'hash', @@ -142,6 +153,9 @@ export const constants = { TEST_HASH_FIELD_2_VALUE: TEST_RUN_ID + '_hash_f_2_val', TEST_HASH_EXPIRE_1: KEY_TTL, TEST_HASH_KEY_2: TEST_RUN_ID + '_hash_2' + CLUSTER_HASH_SLOT, + TEST_HASH_HUGE_KEY: 'big hash 1M', + TEST_HASH_HUGE_KEY_FIELD: 'key678900', + TEST_HASH_HUGE_KEY_VALUE: ' 678900', // Redis Stream TEST_STREAM_TYPE: 'stream', @@ -181,5 +195,11 @@ export const constants = { TEST_SEARCH_JSON_INDEX_1: TEST_RUN_ID + '_json_search_idx_1' + CLUSTER_HASH_SLOT, TEST_SEARCH_JSON_KEY_PREFIX_1: TEST_RUN_ID + '_json_search:', + // Command Executions + TEST_COMMAND_EXECUTION_ID_1: uuidv4(), + + // Plugins + TEST_PLUGIN_VISUALIZATION_ID_1: uuidv4(), + // etc... } diff --git a/redisinsight/api/test/helpers/data/redis.ts b/redisinsight/api/test/helpers/data/redis.ts index 1714f0147b..0ec0812448 100644 --- a/redisinsight/api/test/helpers/data/redis.ts +++ b/redisinsight/api/test/helpers/data/redis.ts @@ -23,14 +23,32 @@ export const initDataHelper = (rte) => { return executeCommand(...command.split(' ')); }; + const flushTestRunData = async (node) => { + if (!constants.TEST_RTE_SHARED_DATA) { + return node.flushall(); + } + + // 5M count looks like "too much" but each test run should generate even less then 100 keys + // we want to not wait for a long time when run tests on huge databases (currently ~4M keys) + const count = constants.TEST_RTE_BIG_DATA ? 5_000_000 : 10_000; + let cursor = null; + let keys = []; + while (cursor !== '0') { + [cursor, keys] = await node.send_command('scan', [cursor, 'count', count, 'match', `${constants.TEST_RUN_ID}*`]) + if (keys.length) { + await node.send_command('del', ...keys) + } + } + } + const truncate = async () => { return client.nodes ? Promise.all(client.nodes('master').map(async (node) => { try { - return node.flushall(); + return flushTestRunData(node); } catch (e) { return null; } - })) : client.flushall(); + })) : flushTestRunData(client); }; // keys @@ -221,7 +239,7 @@ export const initDataHelper = (rte) => { const pipeline = []; const limit = inserted + batchSize; for (inserted; inserted < limit && inserted < number; inserted++) { - pipeline.push(['set', `k_${inserted}`, 'v']); + pipeline.push(['set', `${constants.TEST_RUN_ID}_${inserted}`, 'v']); } await insertKeysBasedOnEnv(pipeline); @@ -230,36 +248,36 @@ export const initDataHelper = (rte) => { const generateNKeys = async (number: number = 15000, clean: boolean) => { await generateAnyKeys([ - { create: n => _.map(new Array(n), (v,i) => ['set', `str_key_${i}`, `str_val_${i}`]) }, // string - { create: n => _.map(new Array(n), (v,i) => ['lpush', `list_key_${i}`, `list_val_${i}`]) }, // list - { create: n => _.map(new Array(n), (v,i) => ['sadd', `set_key_${i}`, `set_val_${i}`]) }, // set - { create: n => _.map(new Array(n), (v,i) => ['zadd', `zset_key_${i}`, 0, `zset_val_${i}`]) }, // zset - { create: n => _.map(new Array(n), (v,i) => ['hset', `hash_key_${i}`, `field`, `hash_val_${i}`]) }, // hash + { create: n => _.map(new Array(n), (v,i) => ['set', `${constants.TEST_RUN_ID}_str_key_${i}`, `str_val_${i}`]) }, // string + { create: n => _.map(new Array(n), (v,i) => ['lpush', `${constants.TEST_RUN_ID}_list_key_${i}`, `list_val_${i}`]) }, // list + { create: n => _.map(new Array(n), (v,i) => ['sadd', `${constants.TEST_RUN_ID}_set_key_${i}`, `set_val_${i}`]) }, // set + { create: n => _.map(new Array(n), (v,i) => ['zadd', `${constants.TEST_RUN_ID}_zset_key_${i}`, 0, `zset_val_${i}`]) }, // zset + { create: n => _.map(new Array(n), (v,i) => ['hset', `${constants.TEST_RUN_ID}_hash_key_${i}`, `field`, `hash_val_${i}`]) }, // hash ], number, clean); }; const generateNReJSONs = async (number: number = 300, clean: boolean) => { const jsonValue = JSON.stringify(constants.TEST_REJSON_VALUE_1); await generateAnyKeys([ - { create: n => _.map(new Array(n), (v,i) => ['json.set', `rejson_key_${i}`, '.', jsonValue]) }, + { create: n => _.map(new Array(n), (v,i) => ['json.set', `${constants.TEST_RUN_ID}_rejson_key_${i}`, '.', jsonValue]) }, ], number, clean); }; const generateNTimeSeries = async (number: number = 300, clean: boolean) => { await generateAnyKeys([ - { create: n => _.map(new Array(n), (v,i) => ['ts.create', `ts_key_${i}`, `ts_val_${i}`]) }, + { create: n => _.map(new Array(n), (v,i) => ['ts.create', `${constants.TEST_RUN_ID}_ts_key_${i}`, `ts_val_${i}`]) }, ], number, clean); }; const generateNStreams = async (number: number = 300, clean: boolean) => { await generateAnyKeys([ - { create: n => _.map(new Array(n), (v,i) => ['xadd', `st_key_${i}`, `*`, `st_field_${i}`, `st_val_${i}`]) }, + { create: n => _.map(new Array(n), (v,i) => ['xadd', `${constants.TEST_RUN_ID}_st_key_${i}`, `*`, `st_field_${i}`, `st_val_${i}`]) }, ], number, clean); }; const generateNGraphs = async (number: number = 300, clean: boolean) => { await generateAnyKeys([ - { create: n => _.map(new Array(n), (v,i) => ['graph.query', `graph_key_${i}`, `CREATE (n_${i})`]) }, + { create: n => _.map(new Array(n), (v,i) => ['graph.query', `${constants.TEST_RUN_ID}_graph_key_${i}`, `CREATE (n_${i})`]) }, ], number, clean); }; diff --git a/redisinsight/api/test/helpers/local-db.ts b/redisinsight/api/test/helpers/local-db.ts index d3b2e2bcf7..a362861e19 100644 --- a/redisinsight/api/test/helpers/local-db.ts +++ b/redisinsight/api/test/helpers/local-db.ts @@ -1,15 +1,20 @@ import { Connection, createConnection, getConnectionManager } from 'typeorm'; +import { v4 as uuidv4 } from 'uuid'; import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity'; import { SettingsEntity } from 'src/modules/core/models/settings.entity'; import { AgreementsEntity } from 'src/modules/core/models/agreements.entity'; +import { CommandExecutionEntity } from "src/modules/workbench/entities/command-execution.entity"; +import { PluginStateEntity } from "src/modules/workbench/entities/plugin-state.entity"; import { constants } from './constants'; -import { createCipheriv, createHash } from 'crypto'; +import { createCipheriv, createDecipheriv, createHash } from 'crypto'; -const repositories = { +export const repositories = { INSTANCE: 'DatabaseInstanceEntity', CA_CERT_REPOSITORY: 'CaCertificateEntity', CLIENT_CERT_REPOSITORY: 'ClientCertificateEntity', AGREEMENTS: 'AgreementsEntity', + COMMAND_EXECUTION: 'CommandExecutionEntity', + PLUGIN_STATE: 'PluginStateEntity', SETTINGS: 'SettingsEntity' } @@ -36,11 +41,11 @@ const getDBConnection = async (): Promise => { return localDbConnection; } -const getRepository = async (repository: string) => { +export const getRepository = async (repository: string) => { return (await getDBConnection()).getRepository(repository); }; -const encryptData = (data) => { +export const encryptData = (data) => { if (!data) { return null; } @@ -59,6 +64,85 @@ const encryptData = (data) => { return data; } +export const decryptData = (data) => { + if (!data) { + return null; + } + + if (constants.TEST_ENCRYPTION_STRATEGY === 'KEYTAR') { + let cipherKey = createHash('sha256') + .update(constants.TEST_KEYTAR_PASSWORD, 'utf8') + .digest(); + + const decipher = createDecipheriv('aes-256-cbc', cipherKey, Buffer.alloc(16, 0)); + let decrypted = decipher.update(data, 'hex', 'utf8'); + decrypted += decipher.final('utf8'); + + return decrypted; + } + + return data; +} + +export const generateNCommandExecutions = async ( + partial: Record, + number: number, + truncate: boolean = false, +) => { + const result = []; + const rep = await getRepository(repositories.COMMAND_EXECUTION); + + if (truncate) { + await rep.clear(); + } + + for (let i = 0; i < number; i++) { + result.push(await rep.save({ + id: uuidv4(), + command: encryptData('set foo bar'), + result: encryptData(JSON.stringify([{ + status: 'success', + response: `"OK_${i}"`, + node: { + host: 'localhost', + port: 6479, + slot: 12499 + } + }])), + nodeOptions: JSON.stringify({ + host: 'localhost', + port: 6479, + enableRedirection: true, + }), + role: 'ALL', + encryption: constants.TEST_ENCRYPTION_STRATEGY, + createdAt: new Date(), + ...partial, + })); + } + + return result; +} + +export const generatePluginState = async ( + partial: Record, + truncate: boolean = false, +) => { + const rep = await getRepository(repositories.PLUGIN_STATE); + + if (truncate) { + await rep.clear(); + } + + return rep.save({ + id: uuidv4(), + state: encryptData(JSON.stringify('some state')), + encryption: constants.TEST_ENCRYPTION_STRATEGY, + createdAt: new Date(), + ...partial, + }) +} + const createCACertificate = async (certificate) => { const rep = await getRepository(repositories.CA_CERT_REPOSITORY); return rep.save(certificate); @@ -227,6 +311,18 @@ export const applyEulaAgreement = async () => { await rep.save(agreements); } +export const setAgreements = async (agreements = {}) => { + const defaultAgreements = {eula: true, encryption: true}; + + const rep = await getRepository(repositories.AGREEMENTS); + const entity: any = await rep.findOne(); + + entity.version = '1.0.0'; + entity.data = JSON.stringify({ ...defaultAgreements, ...agreements }); + + await rep.save(entity); +} + const resetAgreements = async () => { const rep = await getRepository(repositories.AGREEMENTS); const agreements: any = await rep.findOne(); @@ -236,7 +332,7 @@ const resetAgreements = async () => { await rep.save(agreements); } -const initAgreements = async () => { +export const initAgreements = async () => { const rep = await getRepository(repositories.AGREEMENTS); const agreements: any = await rep.findOne(); agreements.version = constants.TEST_AGREEMENTS_VERSION; diff --git a/redisinsight/api/test/helpers/redis.ts b/redisinsight/api/test/helpers/redis.ts index b37d74b79f..98aa29a81c 100644 --- a/redisinsight/api/test/helpers/redis.ts +++ b/redisinsight/api/test/helpers/redis.ts @@ -183,6 +183,8 @@ export const initRTE = async () => { modules: await determineModulesInstalled(rte.client), re: !!constants.TEST_RE_USER, cloud: !!constants.TEST_CLOUD_RTE, + sharedData: constants.TEST_RTE_SHARED_DATA, + bigData: constants.TEST_RTE_BIG_DATA, nodes: [], }; diff --git a/redisinsight/api/test/helpers/test.ts b/redisinsight/api/test/helpers/test.ts index aac6ebd1f7..6bdd18500c 100644 --- a/redisinsight/api/test/helpers/test.ts +++ b/redisinsight/api/test/helpers/test.ts @@ -176,3 +176,23 @@ export const generateInvalidDataTestCases = ( }); }; +export const getMainCheckFn = (endpoint) => async (testCase) => { + it(testCase.name, async () => { + // additional checks before test run + if (testCase.before) { + await testCase.before(); + } + + await validateApiCall({ + endpoint, + ...testCase, + }); + + // additional checks after test pass + if (testCase.after) { + await testCase.after(); + } + }); +}; + +export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); diff --git a/redisinsight/api/test/test-runs/oss-sent/.env b/redisinsight/api/test/test-runs/oss-sent/.env index 014a3d7076..ed2c43a0fe 100644 --- a/redisinsight/api/test/test-runs/oss-sent/.env +++ b/redisinsight/api/test/test-runs/oss-sent/.env @@ -1,3 +1,5 @@ TEST_REDIS_PASSWORD=testpass TEST_SENTINEL_MASTER_GROUP=primary1 TEST_RTE_DISCOVERY_TYPE=SENTINEL +TEST_SENTINEL_MASTER_PASS=dbpass +TEST_REDIS_PORT=26379 diff --git a/redisinsight/api/test/test-runs/oss-sent/docker-compose.yml b/redisinsight/api/test/test-runs/oss-sent/docker-compose.yml index 85b40150a8..b6ee245aff 100644 --- a/redisinsight/api/test/test-runs/oss-sent/docker-compose.yml +++ b/redisinsight/api/test/test-runs/oss-sent/docker-compose.yml @@ -4,9 +4,6 @@ services: test: env_file: - ./oss-sent/.env - environment: - TEST_REDIS_HOST: redis - TEST_REDIS_PORT: 26379 redis: build: ./oss-sent links: @@ -18,9 +15,10 @@ services: p1: image: &r redis:5 + command: redis-server --requirepass dbpass s1_1: image: *r - command: redis-server --slaveof p1 6379 + command: redis-server --slaveof p1 6379 --masterauth dbpass s1_2: image: *r - command: redis-server --slaveof p1 6379 + command: redis-server --slaveof p1 6379 --masterauth dbpass diff --git a/redisinsight/api/test/test-runs/oss-st-6/docker-compose.yml b/redisinsight/api/test/test-runs/oss-st-6/docker-compose.yml index 7b681b7ab3..5fae58d2a9 100644 --- a/redisinsight/api/test/test-runs/oss-st-6/docker-compose.yml +++ b/redisinsight/api/test/test-runs/oss-st-6/docker-compose.yml @@ -2,6 +2,4 @@ version: "3.4" services: redis: -# todo: change back after redislabs/redismod image will be fixed -# image: redislabs/redismod - image: redis:6 + image: redislabs/redismod diff --git a/redisinsight/api/test/test-runs/oss-st-big/.env b/redisinsight/api/test/test-runs/oss-st-big/.env new file mode 100644 index 0000000000..e7a25e7976 --- /dev/null +++ b/redisinsight/api/test/test-runs/oss-st-big/.env @@ -0,0 +1,2 @@ +TEST_RTE_SHARED_DATA=true +TEST_RTE_BIG_DATA=true diff --git a/redisinsight/api/test/test-runs/oss-st-big/Dockerfile b/redisinsight/api/test/test-runs/oss-st-big/Dockerfile new file mode 100644 index 0000000000..66b7369068 --- /dev/null +++ b/redisinsight/api/test/test-runs/oss-st-big/Dockerfile @@ -0,0 +1,10 @@ +FROM redislabs/redismod + +ARG TEST_DB_DUMP +ADD $TEST_DB_DUMP /data/ + +ADD entrypoint.sh . +RUN chmod +x entrypoint.sh + +ENTRYPOINT ["sh", "entrypoint.sh", "redis-server"] +CMD ["--loadmodule", "/usr/lib/redis/modules/redisai.so", "--loadmodule", "/usr/lib/redis/modules/redisearch.so", "--loadmodule", "/usr/lib/redis/modules/redisgraph.so", "--loadmodule", "/usr/lib/redis/modules/redistimeseries.so", "--loadmodule", "/usr/lib/redis/modules/rejson.so", "--loadmodule", "/usr/lib/redis/modules/redisbloom.so", "--loadmodule", "/usr/lib/redis/modules/redisgears.so", "Plugin", "/var/opt/redislabs/modules/rg/plugin/gears_python.so"] diff --git a/redisinsight/api/test/test-runs/oss-st-big/docker-compose.yml b/redisinsight/api/test/test-runs/oss-st-big/docker-compose.yml new file mode 100644 index 0000000000..0dccaf0818 --- /dev/null +++ b/redisinsight/api/test/test-runs/oss-st-big/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3.4" + +services: + test: + env_file: + - ./oss-st-big/.env + redis: + build: + context: ./oss-st-big + dockerfile: Dockerfile + args: + TEST_DB_DUMP: $TEST_MEDIUM_DB_DUMP diff --git a/redisinsight/api/test/test-runs/oss-st-big/entrypoint.sh b/redisinsight/api/test/test-runs/oss-st-big/entrypoint.sh new file mode 100644 index 0000000000..de1dcd8155 --- /dev/null +++ b/redisinsight/api/test/test-runs/oss-st-big/entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -e dump.tar.gz ] +then + echo 'Extracting .rdb file...' + tar -zxvf dump.tar.gz +fi + +exec "$@" diff --git a/redisinsight/api/test/test-runs/re-crdt/.env b/redisinsight/api/test/test-runs/re-crdt/.env new file mode 100644 index 0000000000..0499f8d08a --- /dev/null +++ b/redisinsight/api/test/test-runs/re-crdt/.env @@ -0,0 +1,5 @@ +TEST_RE_HOST=redis +TEST_RE_USER=demo@redislabs.com +TEST_RE_PASS=123456 +TEST_REDIS_PORT=12000 +TEST_RTE_SHARED_DATA=true diff --git a/redisinsight/api/test/test-runs/re-crdt/Dockerfile b/redisinsight/api/test/test-runs/re-crdt/Dockerfile new file mode 100644 index 0000000000..65d2b34abc --- /dev/null +++ b/redisinsight/api/test/test-runs/re-crdt/Dockerfile @@ -0,0 +1,8 @@ +FROM redislabs/redis:6.2.8-50 + +## Set the env var to instruct RE to create a cluster on startup +ENV BOOTSTRAP_ACTION create_cluster + +COPY entrypoint.sh . + +ENTRYPOINT [ "bash", "./entrypoint.sh" ] diff --git a/redisinsight/api/test/test-runs/re-crdt/docker-compose.yml b/redisinsight/api/test/test-runs/re-crdt/docker-compose.yml new file mode 100644 index 0000000000..e321108057 --- /dev/null +++ b/redisinsight/api/test/test-runs/re-crdt/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3.4" + +services: + test: + env_file: + - ./re-crdt/.env + command: ['./wait-for-it.sh', 'redis:12000', '-s', '-t', '120', '--', 'yarn', 'test:api:ci:cov'] + redis: + build: ./re-crdt + environment: + - BOOTSTRAP_CLUSTER_FQDN=cluster1.local + - CREATE_DB=1 + depends_on: + - redis-2 + cap_add: + - sys_resource + env_file: + - ./re-crdt/.env + redis-2: + build: ./re-crdt + environment: + - BOOTSTRAP_CLUSTER_FQDN=cluster2.local + cap_add: + - sys_resource + env_file: + - ./re-crdt/.env diff --git a/redisinsight/api/test/test-runs/re-crdt/entrypoint.sh b/redisinsight/api/test/test-runs/re-crdt/entrypoint.sh new file mode 100644 index 0000000000..0aba90f5ee --- /dev/null +++ b/redisinsight/api/test/test-runs/re-crdt/entrypoint.sh @@ -0,0 +1,50 @@ +#! /bin/bash + +TEST_RE_USER=${TEST_RE_USER:-"demo@redislabs.com"} +TEST_RE_PASS=${TEST_RE_PASS:-"123456"} + +set -e + +# enable job control +set -m + +/opt/start.sh & + +if [ $CREATE_DB ] +then +# This command queries the REST API and outputs the status code +CURL_CMD="curl --silent --fail --output /dev/null -i -w %{http_code} -u $TEST_RE_USER:$TEST_RE_PASS -k https://localhost:9443/v1/nodes" + +# Wait to get 2 consecutive 200 responses from the REST API +while true +do + echo yay $CURL_CMD + CURL_CMD_OUTPUT=$($CURL_CMD || true) + if [ $CURL_CMD_OUTPUT == "200" ] + then + echo "Got 200 response, trying again in 5 seconds to verify..." + sleep 5 + if [ $($CURL_CMD || true) == "200" ] + then + echo "Got 200 response after 5 seconds again, proceeding..." + break + fi + else + echo "Did not get 200 response, got $CURL_CMD_OUTPUT, trying again in 10 seconds..." + sleep 10 + fi +done + +echo "Creating databases..." + +/opt/redislabs/bin/crdb-cli crdb create \ + --name testdb --memory-size 1024mb --port 12000 --replication false --shards-count 1 \ + --oss-cluster true --proxy-policy=all-nodes \ + --instance fqdn=cluster1.local,username="$TEST_RE_USER",password="$TEST_RE_PASS" \ + --instance fqdn=cluster2.local,username="$TEST_RE_USER",password="$TEST_RE_PASS" + +fi + +# now we bring the primary process back into the foreground +# and leave it there +fg diff --git a/redisinsight/api/test/test-runs/re-st/Dockerfile b/redisinsight/api/test/test-runs/re-st/Dockerfile index 8af7097d05..10fd77801a 100644 --- a/redisinsight/api/test/test-runs/re-st/Dockerfile +++ b/redisinsight/api/test/test-runs/re-st/Dockerfile @@ -4,6 +4,10 @@ FROM redislabs/redis:6.2.8-50 ENV BOOTSTRAP_ACTION create_cluster ENV BOOTSTRAP_CLUSTER_FQDN cluster.local +USER root +RUN sed -i "141s/username,/username, 'flash_enabled',/g" bootstrap.py +USER redislabs + COPY entrypoint.sh db.json ./ ENTRYPOINT [ "bash", "./entrypoint.sh" ] diff --git a/redisinsight/api/test/test-runs/re-st/db.json b/redisinsight/api/test/test-runs/re-st/db.json index 750c740eb5..6a927979ef 100644 --- a/redisinsight/api/test/test-runs/re-st/db.json +++ b/redisinsight/api/test/test-runs/re-st/db.json @@ -1,6 +1,8 @@ { "name": "testdb", "type": "redis", + "bigstore": true, + "bigstore_ram_size": 507374182, "memory_size": 1073741824, "port": 12000 } diff --git a/redisinsight/api/tsconfig.json b/redisinsight/api/tsconfig.json index d59e6a2a5f..40ab7a0ffd 100644 --- a/redisinsight/api/tsconfig.json +++ b/redisinsight/api/tsconfig.json @@ -11,6 +11,7 @@ "outDir": "./dist", "baseUrl": "./", "resolveJsonModule": true, + "skipLibCheck": true, "incremental": true, "paths": { "src/*": [ diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock index 846879c23a..8a35b4f728 100644 --- a/redisinsight/api/yarn.lock +++ b/redisinsight/api/yarn.lock @@ -62,32 +62,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/compat-data@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" - integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== - -"@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab" - integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helpers" "^7.14.6" - "@babel/parser" "^7.14.6" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== + dependencies: + "@babel/highlight" "^7.16.0" + +"@babel/compat-data@^7.16.0": + version "7.16.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== + +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" + integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.3" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helpers" "^7.16.5" + "@babel/parser" "^7.16.5" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.5" + "@babel/types" "^7.16.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -95,144 +95,127 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" - integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== +"@babel/generator@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" + integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" - integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== +"@babel/helper-compilation-targets@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.16.0" "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" + browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== +"@babel/helper-environment-visitor@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8" + integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg== dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== +"@babel/helper-function-name@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== dependencies: - "@babel/types" "^7.14.5" + "@babel/helper-get-function-arity" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== +"@babel/helper-get-function-arity@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" - integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== +"@babel/helper-hoist-variables@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-module-imports@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" - integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== +"@babel/helper-module-imports@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-module-transforms@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e" - integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-optimise-call-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" - integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== +"@babel/helper-module-transforms@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29" + integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ== dependencies: - "@babel/types" "^7.14.5" + "@babel/helper-environment-visitor" "^7.16.5" + "@babel/helper-module-imports" "^7.16.0" + "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-validator-identifier" "^7.15.7" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.5" + "@babel/types" "^7.16.0" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" + integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== -"@babel/helper-replace-supers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" - integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== +"@babel/helper-simple-access@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-simple-access@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4" - integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw== +"@babel/helper-split-export-declaration@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-validator-identifier@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" - integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== +"@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== "@babel/helper-validator-option@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== -"@babel/helpers@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635" - integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA== +"@babel/helpers@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd" + integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw== dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.5" + "@babel/types" "^7.16.0" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.15.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" - integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5": + version "7.16.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314" + integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -318,36 +301,44 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/template@^7.14.5", "@babel/template@^7.3.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" - integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" +"@babel/runtime@^7.15.4": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a" + integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.16.0", "@babel/template@^7.3.3": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3" + integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.5" + "@babel/helper-environment-visitor" "^7.16.5" + "@babel/helper-function-name" "^7.16.0" + "@babel/helper-hoist-variables" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/parser" "^7.16.5" + "@babel/types" "^7.16.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff" - integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== +"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -372,10 +363,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@eslint/eslintrc@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" - integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -388,17 +379,31 @@ strip-json-comments "^3.1.1" "@hapi/hoek@^9.0.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" - integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== "@hapi/topo@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz#c19af8577fa393a06e9c77b60995af959be721e7" - integrity sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== dependencies: "@hapi/hoek" "^9.0.0" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -415,15 +420,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" - integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== - dependencies: - "@jest/source-map" "^24.9.0" - chalk "^2.0.1" - slash "^2.0.0" - "@jest/console@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" @@ -533,15 +529,6 @@ optionalDependencies: node-notifier "^8.0.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" - "@jest/source-map@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" @@ -551,15 +538,6 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== - dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@jest/test-result@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" @@ -602,15 +580,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" - "@jest/types@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" @@ -655,9 +624,9 @@ webpack-node-externals "2.5.2" "@nestjs/common@^7.6.15": - version "7.6.17" - resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-7.6.17.tgz#623c7f93117bea15fff07a6b63fcd644a8764655" - integrity sha512-RHvD32FxfV7yDWX9GPmn0ZSv7ka5kLeVamU5ZpoXSTUjkGqWFt3MTyIP+HUQD2778kDqT+CgEtVJ1fxDG5Oh9g== + version "7.6.18" + resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-7.6.18.tgz#d89e6d248985eec13af60507a8725cb2142d660a" + integrity sha512-BUJQHNhWzwWOkS4Ryndzd4HTeRObcAWV2Fh+ermyo3q3xYQQzNoEWclJVL/wZec8AONELwIJ+PSpWI53VP0leg== dependencies: axios "0.21.1" iterare "1.2.1" @@ -665,9 +634,9 @@ uuid "8.3.2" "@nestjs/core@^7.0.0": - version "7.6.17" - resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-7.6.17.tgz#8fba8739e81f4206905109bec62b02a00530c258" - integrity sha512-dH7PGDj1dvBfOYgxJlxh54vdnFFSLst7+Spg3E7Jpo+n11Ht5Ee5mTjSzXieRVfFba/sI3NIHF/N1stn36bU9w== + version "7.6.18" + resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-7.6.18.tgz#36448f0ae7f7d08f032e1e7e53b4a4c82ae844d7" + integrity sha512-CGu20OjIxgFDY7RJT5t1TDGL8wSlTSlbZEkn8U5OlICZEB3WIpi98G7ajJpnRWmEgW8S4aDJmRKGjT+Ntj5U4A== dependencies: "@nuxtjs/opencollective" "0.3.2" fast-safe-stringify "2.0.7" @@ -684,15 +653,15 @@ dependencies: eventemitter2 "6.4.4" -"@nestjs/mapped-types@0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@nestjs/mapped-types/-/mapped-types-0.4.0.tgz#352b9a661d6d36863cf48b2057616cef1b2c802d" - integrity sha512-TVtd/aTb7EqPhVczdeuvzF9dY0fyE3ivvCstc2eO+AkNqrfzSG1kXYYiUUznKjd0qDa8g2TmPSmHUQ21AXsV1Q== +"@nestjs/mapped-types@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@nestjs/mapped-types/-/mapped-types-0.4.1.tgz#e7fe038f0bdda7b8f858fa79ca8516b8f9069b1a" + integrity sha512-JXrw2LMangSU3vnaXWXVX47GRG1FbbNh4aVBbidDjxT3zlghsoNQY6qyWtT001MCl8lJGo8I6i6+DurBRRxl/Q== "@nestjs/platform-express@^7.0.0": - version "7.6.17" - resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-7.6.17.tgz#80b6dc2ac3636af19b5d70573926b5b09da35810" - integrity sha512-lyMwx8X/zTXZzxrd6Xn8BEcS/wuFyEgRVk9f15Z29hSaWHd78mUlBXvSnKJpzsN7wTjU8YWbAy/Ig9kIBS6efg== + version "7.6.18" + resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-7.6.18.tgz#cdf442dfd85948fc7b67bbc4007dddef83cdd4b9" + integrity sha512-Dty2bBhsW7EInMRPS1pkXKJ3GBBusEj6fnEpb0UfkaT3E7asay9c64kCmZE+8hU430qQjY+fhBb1RNWWPnUiwQ== dependencies: body-parser "1.19.0" cors "2.8.5" @@ -700,6 +669,14 @@ multer "1.4.2" tslib "2.2.0" +"@nestjs/platform-socket.io@^8.2.3": + version "8.2.4" + resolved "https://registry.yarnpkg.com/@nestjs/platform-socket.io/-/platform-socket.io-8.2.4.tgz#52b59d1715c8490a71854d86f150e267128b19b0" + integrity sha512-k41BoY9NWrLqltvkFli8QnIbfu9j41gBejZ6VxtjthYci7OLyu/XlnY8k4TuzEYGAHvjgNg5k2CKz7F6xzsDhQ== + dependencies: + socket.io "4.4.0" + tslib "2.3.1" + "@nestjs/schematics@^7.0.0", "@nestjs/schematics@^7.3.0": version "7.3.1" resolved "https://registry.yarnpkg.com/@nestjs/schematics/-/schematics-7.3.1.tgz#68b559d2e6a8a9ecf6c984f87eaa7d4e37a910be" @@ -712,25 +689,25 @@ pluralize "8.0.0" "@nestjs/serve-static@^2.1.3": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nestjs/serve-static/-/serve-static-2.1.4.tgz#d25f7691b0cb19d3f12d161129dd1469dfdc880d" - integrity sha512-w2PpLKzQOB8rJ+vMOy28xm8jwE8VjJfA9U+KOm0H0OY62g2oOWJ+OQPSDogP7XxAzZwq+Bt8wNU2oS8+z6v6Zg== + version "2.2.2" + resolved "https://registry.yarnpkg.com/@nestjs/serve-static/-/serve-static-2.2.2.tgz#8e9dc2fc6c042ddac5133b957d6bc25d9f8fa225" + integrity sha512-3Mr+Q/npS3N7iGoF3Wd6Lj9QcjMGxbNrSqupi5cviM0IKrZ1BHl5qekW95rWYNATAVqoTmjGROAq+nKKpuUagQ== dependencies: path-to-regexp "0.1.7" "@nestjs/swagger@^4.6.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@nestjs/swagger/-/swagger-4.8.0.tgz#7ebfeb0d59e0c27ff40beb429d7311b752c0dca4" - integrity sha512-YU+ahCOoOTZwSHrODHBiQDCqi7GWEjmSFg3Tot/lwVuQ321/3fIOz/lf+ehVQ5DFr7nVMhB7BRWFJLtE/+NhqQ== + version "4.8.2" + resolved "https://registry.yarnpkg.com/@nestjs/swagger/-/swagger-4.8.2.tgz#0a0b3ca1b25146e797ca77addd9fa97f82406c1c" + integrity sha512-RSUwcVxrzXF7/b/IZ5lXnYHJ6jIGS9wWRTJKIt1kIaCNWT+0wRfTlAyhQkzs2g35/PTXJEcdIwwY7mBO/bwHzw== dependencies: - "@nestjs/mapped-types" "0.4.0" + "@nestjs/mapped-types" "0.4.1" lodash "4.17.21" path-to-regexp "3.2.0" "@nestjs/testing@^7.0.0": - version "7.6.17" - resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-7.6.17.tgz#dab17527dbbc12c674b21de9527d280ee065932b" - integrity sha512-wWImNvfRapCCtLXMsxCs1Ax2Uj/qSytCnolSEXL7LnH80exwHRmBeLtTfGxArsv9Y1NHr24NarfN6H0QxysZ3g== + version "7.6.18" + resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-7.6.18.tgz#b4c137b5b6c2fb18c51602d33a083cd97c648283" + integrity sha512-1AVk9vWZlPpx4CmzY6z9z0DHFgGCadfr01QdisGFAN740JwKqZWEqz12cVd+nsXDlYQPFRkp2ICBIS/6k1qZGQ== dependencies: optional "0.1.4" tslib "2.2.0" @@ -742,6 +719,15 @@ dependencies: uuid "8.3.1" +"@nestjs/websockets@^8.2.3": + version "8.2.4" + resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-8.2.4.tgz#ff18cf6e4d770e15eee02a0ce7c629fc31b755c2" + integrity sha512-huCP6F+L0eyQ4w1aWn3QKQiEjp5/V4sw+JJ0CINSD1+Ccs3NCe9l53rFyrCD2fbLLCIryh7mkED7wwp2uEcsiw== + dependencies: + iterare "1.2.1" + object-hash "2.2.0" + tslib "2.3.1" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -756,9 +742,9 @@ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2" - integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" @@ -788,10 +774,10 @@ component-type "^1.2.1" join-component "^1.1.0" -"@sideway/address@^4.1.0": - version "4.1.2" - resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.2.tgz#811b84333a335739d3969cfc434736268170cad1" - integrity sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA== +"@sideway/address@^4.1.3": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" + integrity sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ== dependencies: "@hapi/hoek" "^9.0.0" @@ -837,9 +823,9 @@ axios "*" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.14" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" - integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== + version "7.1.17" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64" + integrity sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -848,67 +834,82 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + version "7.6.3" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" + integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" - integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" "@types/body-parser@*": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" "@types/node" "*" +"@types/component-emitter@^1.2.10": + version "1.2.11" + resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506" + integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ== + "@types/connect@*": - version "3.4.34" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" - integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== dependencies: "@types/node" "*" +"@types/cookie@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" + integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== + "@types/cookiejar@*": version "2.1.2" resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== +"@types/cors@^2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + "@types/eslint-scope@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" - integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== + version "3.7.2" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.2.tgz#11e96a868c67acf65bf6f11d10bb89ea71d5e473" + integrity sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "7.2.13" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53" - integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg== + version "8.2.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.1.tgz#13f3d69bac93c2ae008019c28783868d0a1d6605" + integrity sha512-UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*": - version "0.0.48" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74" - integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew== + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== "@types/estree@^0.0.46": version "0.0.46" @@ -916,18 +917,18 @@ integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== "@types/express-serve-static-core@^4.17.18": - version "4.17.21" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz#a427278e106bca77b83ad85221eae709a3414d42" - integrity sha512-gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA== + version "4.17.26" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz#5d9a8eeecb9d5f9d7fc1d85f541512a84638ae88" + integrity sha512-zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@^4.17.3": - version "4.17.12" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350" - integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q== + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -942,9 +943,9 @@ "@types/node" "*" "@types/ioredis@^4.22.3": - version "4.26.4" - resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.26.4.tgz#a2b1ed51ddd2c707d7eaac5017cc34a0fe51558a" - integrity sha512-QFbjNq7EnOGw6d1gZZt2h26OFXjx7z+eqEnbCHSrDI1OOLEgOHMKdtIajJbuCr9uO+X9kQQRe7Lz6uxqxl5XKg== + version "4.28.5" + resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.28.5.tgz#933aa76dd0b66147be48f94967e2571ff848408e" + integrity sha512-bp5mdpzscWZMEE/jLvvzze5TZFYGhynB1am69l/a0XPqZRXWpbswY6lb5buEht57jOnw5pPG5zL9pFUWw1nggw== dependencies: "@types/node" "*" @@ -960,14 +961,6 @@ dependencies: "@types/istanbul-lib-coverage" "*" -"@types/istanbul-reports@^1.1.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" - integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - "@types/istanbul-reports@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" @@ -976,17 +969,17 @@ "@types/istanbul-lib-report" "*" "@types/jest@^26.0.15": - version "26.0.23" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7" - integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA== + version "26.0.24" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" + integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/json5@^0.0.29": version "0.0.29" @@ -994,19 +987,19 @@ integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/lodash@^4.14.167": - version "4.14.170" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6" - integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q== + version "4.14.178" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" + integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/node@*": - version "15.12.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" - integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== +"@types/node@*", "@types/node@>=10.0.0": + version "17.0.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.4.tgz#fec0ce0526abb6062fd206d72a642811b887a111" + integrity sha512-6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog== "@types/node@14.14.10": version "14.14.10" @@ -1014,9 +1007,9 @@ integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1024,42 +1017,44 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb" - integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw== + version "2.4.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281" + integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA== "@types/qs@*": - version "6.9.6" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" - integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/range-parser@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/serve-static@*": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" - integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== dependencies: "@types/mime" "^1" "@types/node" "*" -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/socket.io@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-3.0.2.tgz#606c9639e3f93bb8454cba8f5f0a283d47917759" + integrity sha512-pu0sN9m5VjCxBZVK8hW37ZcMe8rjn4HHggBN5CbaRTvFwv5jOmuIRZEuddsBPa9Th0ts0SIo3Niukq+95cMBbQ== + dependencies: + socket.io "*" "@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/superagent@*": - version "4.1.11" - resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.11.tgz#4822bc64a82a0f579261a77097dbca276556c20e" - integrity sha512-cZkWBXZI+jESnUTp8RDGBmk1Zn2MkScP4V5bjD7DyqB7L0WNWpblh4KX5K/6aTqxFZMhfo1bhi2cwoAEDVBBJw== + version "4.1.13" + resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.13.tgz#0aaa3f4ff9404b94932d1dcdfb7f3d39d23997a0" + integrity sha512-YIGelp3ZyMiH0/A09PMAORO0EBGlF5xIKfDpK74wdYvWUs2o96b5CItJcWPdH409b7SAXIIG6p8NdU/4U2Maww== dependencies: "@types/cookiejar" "*" "@types/node" "*" @@ -1077,141 +1072,90 @@ integrity sha512-WAy5txG7aFX8Vw3sloEKp5p/t/Xt8jD3GRD9DacnFv6Vo8ubudAsRTXgxpQwU0mpzY/H8U4db3roDuCMjShBmw== "@types/yargs-parser@*": - version "20.2.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" - integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== - -"@types/yargs@^13.0.0": - version "13.0.11" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.11.tgz#def2f0c93e4bdf2c61d7e34899b17e34be28d3b1" - integrity sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ== - dependencies: - "@types/yargs-parser" "*" + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^15.0.0": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== + version "15.0.14" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" + integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== dependencies: "@types/yargs-parser" "*" -"@types/zen-observable@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" - integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== +"@types/zen-observable@0.8.3": + version "0.8.3" + resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3" + integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== "@typescript-eslint/eslint-plugin@^4.8.1": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz#0b7fc974e8bc9b2b5eb98ed51427b0be529b4ad0" - integrity sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ== + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" + integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== dependencies: - "@typescript-eslint/experimental-utils" "4.27.0" - "@typescript-eslint/scope-manager" "4.27.0" + "@typescript-eslint/experimental-utils" "4.33.0" + "@typescript-eslint/scope-manager" "4.33.0" debug "^4.3.1" functional-red-black-tree "^1.0.1" - lodash "^4.17.21" + ignore "^5.1.8" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.27.0": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c" - integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ== +"@typescript-eslint/experimental-utils@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" + integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.27.0" - "@typescript-eslint/types" "4.27.0" - "@typescript-eslint/typescript-estree" "4.27.0" + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/parser@^4.4.1": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d" - integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg== +"@typescript-eslint/parser@^4.4.1", "@typescript-eslint/parser@^4.8.1": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" + integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== dependencies: - "@typescript-eslint/scope-manager" "4.29.1" - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/typescript-estree" "4.29.1" + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" debug "^4.3.1" -"@typescript-eslint/parser@^4.8.1": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94" - integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ== +"@typescript-eslint/scope-manager@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" + integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== dependencies: - "@typescript-eslint/scope-manager" "4.27.0" - "@typescript-eslint/types" "4.27.0" - "@typescript-eslint/typescript-estree" "4.27.0" - debug "^4.3.1" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" -"@typescript-eslint/scope-manager@4.27.0": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d" - integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw== - dependencies: - "@typescript-eslint/types" "4.27.0" - "@typescript-eslint/visitor-keys" "4.27.0" - -"@typescript-eslint/scope-manager@4.29.1": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358" - integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A== - dependencies: - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/visitor-keys" "4.29.1" - -"@typescript-eslint/types@4.27.0": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8" - integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA== - -"@typescript-eslint/types@4.29.1": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5" - integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA== - -"@typescript-eslint/typescript-estree@4.27.0": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da" - integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g== - dependencies: - "@typescript-eslint/types" "4.27.0" - "@typescript-eslint/visitor-keys" "4.27.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" +"@typescript-eslint/types@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" + integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== -"@typescript-eslint/typescript-estree@4.29.1": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f" - integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw== +"@typescript-eslint/typescript-estree@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" + integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== dependencies: - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/visitor-keys" "4.29.1" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.27.0": - version "4.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81" - integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg== +"@typescript-eslint/visitor-keys@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" + integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== dependencies: - "@typescript-eslint/types" "4.27.0" - eslint-visitor-keys "^2.0.0" - -"@typescript-eslint/visitor-keys@4.29.1": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d" - integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag== - dependencies: - "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" "@ungap/promise-all-settled@1.1.2": @@ -1360,7 +1304,7 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.7: +accepts@~1.3.4, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== @@ -1377,9 +1321,9 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" @@ -1392,9 +1336,14 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.0.4, acorn@^8.2.4: - version "8.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" - integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== + version "8.6.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" + integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== + +adm-zip@^0.5.9: + version "0.5.9" + resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.9.tgz#b33691028333821c0cf95c31374c5462f2905a83" + integrity sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg== agent-base@6: version "6.0.2" @@ -1427,9 +1376,9 @@ ajv@6.12.6, ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.6.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" - integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== + version "8.8.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1462,7 +1411,7 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.21.3" -ansi-regex@^2.0.0, ansi-regex@^2.1.1: +ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= @@ -1472,20 +1421,15 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= +ansi-regex@^5.0.0, ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" @@ -1594,16 +1538,16 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-includes@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" - integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== +array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" + es-abstract "^1.19.1" get-intrinsic "^1.1.1" - is-string "^1.0.5" + is-string "^1.0.7" array-union@^2.1.0: version "2.1.0" @@ -1615,14 +1559,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" - integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== +array.prototype.flat@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13" + integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.19.0" arrify@^1.0.0: version "1.0.1" @@ -1630,9 +1574,9 @@ arrify@^1.0.0: integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + version "0.2.6" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" + integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== dependencies: safer-buffer "~2.1.0" @@ -1657,9 +1601,9 @@ astral-regex@^2.0.0: integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + version "3.2.2" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" + integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== asynckit@^0.4.0: version "0.4.0" @@ -1687,11 +1631,12 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axios-retry@^3.0.2: - version "3.1.9" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.1.9.tgz#6c30fc9aeb4519aebaec758b90ef56fa03fe72e8" - integrity sha512-NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA== + version "3.2.4" + resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.2.4.tgz#f447a53c3456f5bfeca18f20c3a3272207d082ae" + integrity sha512-Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ== dependencies: - is-retry-allowed "^1.1.0" + "@babel/runtime" "^7.15.4" + is-retry-allowed "^2.2.0" axios@*, axios@0.21.1, axios@^0.21.0, axios@^0.21.1: version "0.21.1" @@ -1715,14 +1660,14 @@ babel-jest@^26.6.3: slash "^3.0.0" babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@istanbuljs/load-nyc-config" "^1.0.0" "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" + istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" babel-plugin-jest-hoist@^26.6.2: @@ -1766,11 +1711,21 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +base64-arraybuffer@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz#87bd13525626db4a9838e00a508c2b73efcf348c" + integrity sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA== + base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +base64id@2.0.0, base64id@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" + integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== + base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -1817,7 +1772,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -body-parser@1.19.0, body-parser@^1.19.0: +body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== @@ -1833,6 +1788,22 @@ body-parser@1.19.0, body-parser@^1.19.0: raw-body "2.4.0" type-is "~1.6.17" +body-parser@1.19.1, body-parser@^1.19.0: + version "1.19.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" + integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== + dependencies: + bytes "3.1.1" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.8.1" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.9.6" + raw-body "2.4.2" + type-is "~1.6.18" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1874,16 +1845,16 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.14.5, browserslist@^4.16.6: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.14.5, browserslist@^4.17.5: + version "4.19.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" + integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^2.0.1" + picocolors "^1.0.0" bs-logger@0.x: version "0.2.6" @@ -1900,9 +1871,9 @@ bser@2.1.1: node-int64 "^0.4.0" buffer-from@1.x, buffer-from@^1.0.0, buffer-from@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer@^5.5.0: version "5.7.1" @@ -1920,16 +1891,6 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -bunyan@^1.8.12: - version "1.8.15" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" - integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== - optionalDependencies: - dtrace-provider "~0.8" - moment "^2.19.3" - mv "~2" - safe-json-stringify "~1" - busboy@^0.2.11: version "0.2.14" resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" @@ -1943,6 +1904,11 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -1987,14 +1953,14 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + version "6.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== -caniuse-lite@^1.0.30001219: - version "1.0.30001237" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5" - integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw== +caniuse-lite@^1.0.30001286: + version "1.0.30001292" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456" + integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw== capture-exit@^2.0.0: version "2.0.0" @@ -2028,18 +1994,7 @@ chalk@3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2049,9 +2004,9 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2156,16 +2111,15 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz#11ecfb58a79278cf6035a60c54e338f9d837897c" - integrity sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A== +cli-color@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.1.tgz#93e3491308691f1e46beb78b63d0fb2585e42ba6" + integrity sha512-eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg== dependencies: - ansi-regex "^2.1.1" d "^1.0.1" - es5-ext "^0.10.51" + es5-ext "^0.10.53" es6-iterator "^2.0.3" - memoizee "^0.4.14" + memoizee "^0.4.15" timers-ext "^0.1.7" cli-cursor@^3.1.0: @@ -2175,7 +2129,7 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-highlight@^2.1.10: +cli-highlight@^2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== @@ -2188,9 +2142,9 @@ cli-highlight@^2.1.10: yargs "^16.0.0" cli-spinners@^2.5.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939" - integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== cli-table3@0.5.1: version "0.5.1" @@ -2267,7 +2221,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2291,26 +2245,21 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.2: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== +color-string@^1.6.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" + integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + color-convert "^1.9.3" + color-string "^1.6.0" colors@^1.1.2, colors@^1.2.1: version "1.4.0" @@ -2318,11 +2267,11 @@ colors@^1.1.2, colors@^1.2.1: integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== dependencies: - color "3.0.x" + color "^3.1.3" text-hex "1.0.x" combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: @@ -2347,7 +2296,7 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-emitter@^1.2.0, component-emitter@^1.2.1: +component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -2388,9 +2337,9 @@ concurrently@^5.3.0: yargs "^13.3.0" confusing-browser-globals@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59" - integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA== + version "1.0.11" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" + integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== consola@^2.15.0: version "2.15.3" @@ -2409,15 +2358,22 @@ content-disposition@0.5.3: dependencies: safe-buffer "5.1.2" +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" @@ -2431,10 +2387,15 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@0.4.1, cookie@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + cookiejar@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" - integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== + version "2.1.3" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" + integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== copy-descriptor@^0.1.0: version "0.1.1" @@ -2451,7 +2412,7 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cors@2.8.5: +cors@2.8.5, cors@~2.8.5: version "2.8.5" resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== @@ -2549,9 +2510,9 @@ data-urls@^2.0.0: whatwg-url "^8.0.0" date-fns@^2.0.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4" - integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg== + version "2.27.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.27.0.tgz#e1ff3c3ddbbab8a2eaadbb6106be2929a5a2d92b" + integrity sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q== debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" @@ -2560,7 +2521,14 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -2585,9 +2553,9 @@ decamelize@^4.0.0: integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== decimal.js@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decode-uri-component@^0.2.0: version "0.2.0" @@ -2614,9 +2582,9 @@ deep-extend@^0.6.0: integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" @@ -2677,9 +2645,9 @@ delegates@^1.0.0: integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= denque@^1.1.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" - integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== + version "1.5.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" + integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== depd@~1.1.2: version "1.1.2" @@ -2709,11 +2677,6 @@ dicer@0.2.5: readable-stream "1.1.x" streamsearch "0.1.2" -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== - diff-sequences@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" @@ -2767,13 +2730,6 @@ dotenv@^8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== -dtrace-provider@~0.8: - version "0.8.8" - resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" - integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== - dependencies: - nan "^2.14.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -2787,10 +2743,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.723: - version "1.3.752" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" - integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== +electron-to-chromium@^1.4.17: + version "1.4.27" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.27.tgz#bfc6e798d8a56a17d658312f4b7ae1a7ca87724f" + integrity sha512-uZ95szi3zUbzRDx1zx/xnsCG+2xgZyy57pDOeaeO4r8zx5Dqe8Jv1ti8cunvBwJHVI5LzPuw8umKwZb3WKYxSQ== emittery@^0.7.1: version "0.7.2" @@ -2829,6 +2785,29 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" +engine.io-parser@~5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.2.tgz#69a2ec3ed431da021f0666712d07f106bcffa6ce" + integrity sha512-wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g== + dependencies: + base64-arraybuffer "~1.0.1" + +engine.io@~6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.0.tgz#459eab0c3724899d7b63a20c3a6835cf92857939" + integrity sha512-ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw== + dependencies: + "@types/cookie" "^0.4.1" + "@types/cors" "^2.8.12" + "@types/node" ">=10.0.0" + accepts "~1.3.4" + base64id "2.0.0" + cookie "~0.4.1" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~5.0.0" + ws "~8.2.3" + enhanced-resolve@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" @@ -2839,9 +2818,9 @@ enhanced-resolve@^4.0.0: tapable "^1.0.0" enhanced-resolve@^5.7.0: - version "5.8.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" - integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== + version "5.8.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -2867,22 +2846,26 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== +es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" has "^1.0.3" has-symbols "^1.0.2" - is-callable "^1.2.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" is-negative-zero "^2.0.1" - is-regex "^1.1.3" - is-string "^1.0.6" - object-inspect "^1.10.3" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -2903,7 +2886,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.51, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: +es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: version "0.10.53" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== @@ -2959,7 +2942,7 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -3027,42 +3010,41 @@ eslint-config-prettier@^6.10.0: dependencies: get-stdin "^6.0.0" -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" - integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== +eslint-module-utils@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" + integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== dependencies: debug "^3.2.7" + find-up "^2.1.0" pkg-dir "^2.0.0" eslint-plugin-import@^2.20.1: - version "2.23.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" - integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== + version "2.25.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766" + integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg== dependencies: - array-includes "^3.1.3" - array.prototype.flat "^1.2.4" + array-includes "^3.1.4" + array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.1" - find-up "^2.0.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.7.1" has "^1.0.3" - is-core-module "^2.4.0" + is-core-module "^2.8.0" + is-glob "^4.0.3" minimatch "^3.0.4" - object.values "^1.1.3" - pkg-up "^2.0.0" - read-pkg-up "^3.0.0" + object.values "^1.1.5" resolve "^1.20.0" - tsconfig-paths "^3.9.0" + tsconfig-paths "^3.11.0" eslint-plugin-sonarjs@^0.9.1: version "0.9.1" @@ -3102,12 +3084,13 @@ eslint-visitor-keys@^2.0.0: integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint@^7.1.0: - version "7.28.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" - integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.2" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -3185,9 +3168,9 @@ estraverse@^4.1.1, estraverse@^4.2.0: integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -3273,18 +3256,6 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== -expect@^24.8.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" - integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== - dependencies: - "@jest/types" "^24.9.0" - ansi-styles "^3.2.0" - jest-get-type "^24.9.0" - jest-matcher-utils "^24.9.0" - jest-message-util "^24.9.0" - jest-regex-util "^24.9.0" - expect@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" @@ -3297,7 +3268,7 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" -express@4.17.1, express@^4.17.1: +express@4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== @@ -3333,12 +3304,48 @@ express@4.17.1, express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" +express@^4.17.1: + version "4.17.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" + integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.1" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.4.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.9.6" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + version "1.6.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52" + integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg== dependencies: - type "^2.0.0" + type "^2.5.0" extend-shallow@^2.0.1: version "2.0.1" @@ -3389,9 +3396,9 @@ extsprintf@1.3.0: integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -3399,16 +3406,15 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -3420,15 +3426,20 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-safe-stringify@2.0.7, fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.0.7: +fast-safe-stringify@2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== +fast-safe-stringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" + integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== + fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" @@ -3445,9 +3456,9 @@ fecha@^4.2.0: integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== fengari-interop@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/fengari-interop/-/fengari-interop-0.1.2.tgz#f7731dcdd2ff4449073fb7ac3c451a8841ce1e87" - integrity sha512-8iTvaByZVoi+lQJhHH9vC+c/Yaok9CwOqNQZN6JrVpjmWwW4dDkeblBXhnHC+BoI6eF4Cy5NKW3z6ICEjvgywQ== + version "0.1.3" + resolved "https://registry.yarnpkg.com/fengari-interop/-/fengari-interop-0.1.3.tgz#3ad37a90e7430b69b365441e9fc0ba168942a146" + integrity sha512-EtZ+oTu3kEwVJnoymFPBVLIbQcCoy9uWCVnMA6h3M/RqHkUBsLYp29+RRHf9rKr6GwjubWREU1O7RretFIXjHw== fengari@^0.1.4: version "0.1.4" @@ -3458,11 +3469,6 @@ fengari@^0.1.4: sprintf-js "^1.1.1" tmp "^0.0.33" -figlet@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.0.tgz#2db4d00a584e5155a96080632db919213c3e003c" - integrity sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww== - figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -3515,9 +3521,9 @@ finalhandler@~1.1.2: unpipe "~1.0.0" find-cache-dir@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -3531,7 +3537,7 @@ find-up@5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@^2.0.0, find-up@^2.1.0: +find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -3567,9 +3573,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.4" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2" + integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw== fn.name@1.x.x: version "1.1.0" @@ -3577,9 +3583,9 @@ fn.name@1.x.x: integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.10.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + version "1.14.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" + integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== for-in@^1.0.2: version "1.0.2" @@ -3645,9 +3651,9 @@ form-data@~2.3.2: mime-types "^2.1.12" formidable@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" - integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== + version "1.2.6" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168" + integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ== forwarded@0.2.0: version "0.2.0" @@ -3766,7 +3772,7 @@ get-func-name@^2.0.0: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -3799,6 +3805,14 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -3816,7 +3830,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -3840,21 +3854,10 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3869,9 +3872,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + version "13.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" + integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== dependencies: type-fest "^0.20.2" @@ -3888,16 +3891,11 @@ globby@^11.0.3: slash "^3.0.0" google-libphonenumber@^3.2.8: - version "3.2.21" - resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.21.tgz#6c01e037ef580dd5c580e6bf3129aa6c1581969f" - integrity sha512-d8dMePLPIZXHGEvyGM4PTEPBxXC29mhXtqruD11iZd9KzyKb216kJuBPZq6m3BTmiI5ZiIb4epzrZsatRJ5ZaA== + version "3.2.25" + resolved "https://registry.yarnpkg.com/google-libphonenumber/-/google-libphonenumber-3.2.25.tgz#3bc1a041fa392739d201eacf66761df236f1614b" + integrity sha512-M/b5mij5o2aGnbe+Id9O3847jBtP0baW61foFkevxBxbuV4LH9AcujjYLd2UVkUPKVdMpKyBZxfeNwdxqobQFQ== -graceful-fs@^4.1.15, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== - -graceful-fs@^4.1.2: +graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -3925,13 +3923,6 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" @@ -3952,6 +3943,13 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -4041,6 +4039,17 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + http-errors@~1.7.2: version "1.7.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" @@ -4107,10 +4116,10 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== +ignore@^5.1.4, ignore@^5.1.8: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" @@ -4121,9 +4130,9 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: resolve-from "^4.0.0" import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" + integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -4180,15 +4189,24 @@ inquirer@7.3.3: strip-ansi "^6.0.0" through "^2.3.6" +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + interpret@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== ioredis-mock@^5.5.4: - version "5.6.0" - resolved "https://registry.yarnpkg.com/ioredis-mock/-/ioredis-mock-5.6.0.tgz#f60f9fbc3a53b50f567be9369e2b211ed52c0653" - integrity sha512-Ow+tyKdijg/gA2gSEv7lq8dLp6bO7FnwDXbJ9as37NF23XNRGMLzBc7ITaqMydfrbTodWnLcE2lKEaBs7SBpyA== + version "5.8.1" + resolved "https://registry.yarnpkg.com/ioredis-mock/-/ioredis-mock-5.8.1.tgz#5221260a7165c1d0a6db40f7245d7eb8996cd9d2" + integrity sha512-YWUoE7ZZLzo2fJMWLjeh3F/TkgHqeazdOeExZskit+/2ZSA0bsFPkXiKMOUHZxjOk2JskOP9iuYvf/iO3mhMZg== dependencies: fengari "^0.1.4" fengari-interop "^0.1.2" @@ -4196,15 +4214,16 @@ ioredis-mock@^5.5.4: standard-as-callback "^2.1.0" ioredis@^4.27.1: - version "4.27.6" - resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.27.6.tgz#a53d427d3fe75fbd10ed7ad150ce00559df8dcf8" - integrity sha512-6W3ZHMbpCa8ByMyC1LJGOi7P2WiOKP9B3resoZOVLDhi+6dDBOW+KNsRq3yI36Hmnb2sifCxHX+YSarTeXh48A== + version "4.28.2" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.2.tgz#493ccd5d869fd0ec86c96498192718171f6c9203" + integrity sha512-kQ+Iv7+c6HsDdPP2XUHaMv8DhnSeAeKEwMbaoqsXYbO+03dItXt7+5jGQDRyjdRUV2rFJbzg7P4Qt1iX2tqkOg== dependencies: cluster-key-slot "^1.1.0" debug "^4.3.1" denque "^1.1.0" lodash.defaults "^4.2.0" lodash.flatten "^4.4.0" + lodash.isarguments "^3.1.0" p-map "^2.1.0" redis-commands "1.7.0" redis-errors "^1.2.0" @@ -4241,9 +4260,11 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" @@ -4253,21 +4274,22 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5, is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-ci@^2.0.0: version "2.0.0" @@ -4276,10 +4298,10 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0, is-core-module@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" - integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== +is-core-module@^2.2.0, is-core-module@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== dependencies: has "^1.0.3" @@ -4298,9 +4320,11 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" - integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -4364,10 +4388,10 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" @@ -4377,14 +4401,16 @@ is-interactive@^1.0.0: integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" is-number@^3.0.0: version "3.0.0" @@ -4420,18 +4446,23 @@ is-promise@^2.2.2: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== -is-regex@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.2" + has-tostringtag "^1.0.0" -is-retry-allowed@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" - integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== +is-retry-allowed@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" + integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^1.1.0: version "1.1.0" @@ -4439,14 +4470,16 @@ is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5, is-string@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" - integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" @@ -4465,6 +4498,13 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== +is-weakref@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4509,10 +4549,10 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== +istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-hook@^3.0.0: version "3.0.0" @@ -4531,6 +4571,17 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: istanbul-lib-coverage "^3.0.0" semver "^6.3.0" +istanbul-lib-instrument@^5.0.4: + version "5.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" + integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.2.0" + semver "^6.3.0" + istanbul-lib-processinfo@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz#e1426514662244b2f25df728e8fd1ba35fe53b9c" @@ -4554,18 +4605,18 @@ istanbul-lib-report@^3.0.0: supports-color "^7.1.0" istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== dependencies: debug "^4.1.1" istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" istanbul-reports@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.1.tgz#7085857f17d2441053c6ce5c3b8fdf6882289397" + integrity sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -4627,16 +4678,6 @@ jest-config@^26.6.3: micromatch "^4.0.2" pretty-format "^26.6.2" -jest-diff@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== - dependencies: - chalk "^2.0.1" - diff-sequences "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" - jest-diff@^26.0.0, jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" @@ -4690,11 +4731,6 @@ jest-environment-node@^26.6.2: jest-mock "^26.6.2" jest-util "^26.6.2" -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== - jest-get-type@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" @@ -4753,16 +4789,6 @@ jest-leak-detector@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-matcher-utils@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" - integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== - dependencies: - chalk "^2.0.1" - jest-diff "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" - jest-matcher-utils@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" @@ -4773,20 +4799,6 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/stack-utils" "^1.0.1" - chalk "^2.0.1" - micromatch "^3.1.10" - slash "^2.0.0" - stack-utils "^1.0.1" - jest-message-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" @@ -4815,11 +4827,6 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" - integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== - jest-regex-util@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" @@ -4975,12 +4982,9 @@ jest-watcher@^26.6.2: string-length "^4.0.1" jest-when@^3.2.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/jest-when/-/jest-when-3.3.1.tgz#04f978b2e522a290b1d91db7ab6ca029a7925513" - integrity sha512-nbQxKeHqfmoSE38TfLVPCgxG+rnsgHSXsdH1wdE9bqHt9US6twHjSXV+fD4ncfsIWNXqhv7zRvN5jn/QYL2UwA== - dependencies: - bunyan "^1.8.12" - expect "^24.8.0" + version "3.5.0" + resolved "https://registry.yarnpkg.com/jest-when/-/jest-when-3.5.0.tgz#364ab8dc149a5d683f9cc14e44d73d03b84b0d97" + integrity sha512-/IkPkG5lo2tyXH3a+VraYe7t/ma6UK9VPQko7hr6YgEtjoHyfAPpLXzyhnSNxxKRzNQDrw8YoGPCOkdTLR4mHA== jest-worker@^26.6.2: version "26.6.2" @@ -4991,10 +4995,10 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" - integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== +jest-worker@^27.4.1: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242" + integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -5010,13 +5014,13 @@ jest@^26.6.3: jest-cli "^26.6.3" joi@^17.4.0: - version "17.4.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20" - integrity sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg== + version "17.5.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.5.0.tgz#7e66d0004b5045d971cf416a55fb61d33ac6e011" + integrity sha512-R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" - "@sideway/address" "^4.1.0" + "@sideway/address" "^4.1.3" "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" @@ -5058,9 +5062,9 @@ jsbn@~0.1.0: integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -5087,7 +5091,7 @@ jsdom@^16.4.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -5115,10 +5119,10 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +json-schema@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" + integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" @@ -5168,13 +5172,13 @@ jsonpath@^1.1.1: underscore "1.12.1" jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + version "1.4.2" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" + integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" - json-schema "0.2.3" + json-schema "0.4.0" verror "1.10.0" keytar@^7.7.0: @@ -5241,19 +5245,9 @@ levn@~0.3.0: type-check "~0.3.2" lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== loader-runner@^4.2.0: version "4.2.0" @@ -5299,11 +5293,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -5319,6 +5308,11 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= +lodash.isarguments@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + lodash.isstring@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" @@ -5360,14 +5354,14 @@ log-symbols@^4.0.0, log-symbols@^4.1.0: is-unicode-supported "^0.1.0" logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz#a3997a05985de2ebd325ae0d166dffc9c6fe6b57" + integrity sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ== dependencies: colors "^1.2.1" - fast-safe-stringify "^2.0.4" fecha "^4.2.0" ms "^2.1.1" + safe-stable-stringify "^1.1.0" triple-beam "^1.3.0" lru-cache@^6.0.0: @@ -5408,12 +5402,12 @@ make-error@1.x, make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== dependencies: - tmpl "1.0.x" + tmpl "1.0.5" map-cache@^0.2.2: version "0.2.2" @@ -5442,13 +5436,13 @@ media-typer@0.3.0: integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memfs@^3.1.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== + version "3.4.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.0.tgz#8bc12062b973be6b295d4340595736a656f0a257" + integrity sha512-o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA== dependencies: fs-monkey "1.0.3" -memoizee@^0.4.14: +memoizee@^0.4.15: version "0.4.15" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72" integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ== @@ -5490,7 +5484,7 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5509,7 +5503,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.0, micromatch@^4.0.2: +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -5517,29 +5511,17 @@ micromatch@^4.0.0, micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.48.0: - version "1.48.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" - integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== -mime-db@1.49.0: - version "1.49.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" - integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.32" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" - integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== - dependencies: - mime-db "1.49.0" - -mime-types@^2.1.27, mime-types@~2.1.24: - version "2.1.31" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" - integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: - mime-db "1.48.0" + mime-db "1.51.0" mime@1.6.0, mime@^1.4.1: version "1.6.0" @@ -5556,7 +5538,7 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -5609,14 +5591,14 @@ mkdirp@1.x, mkdirp@^1.0.4: minimist "^1.2.5" mocha-junit-reporter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-2.0.0.tgz#3bf990fce7a42c0d2b718f188553a25d9f24b9a2" - integrity sha512-20HoWh2HEfhqmigfXOKUhZQyX23JImskc37ZOhIjBKoBEsb+4cAFRJpAVhFpnvsztLklW/gFVzsrobjLwmX4lA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz#d521689b651dc52f52044739f8ffb368be415731" + integrity sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg== dependencies: debug "^2.2.0" md5 "^2.1.0" mkdirp "~0.5.1" - strip-ansi "^4.0.0" + strip-ansi "^6.0.1" xml "^1.0.0" mocha-multi-reporters@^1.5.1: @@ -5658,7 +5640,7 @@ mocha@^8.4.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" -moment@^2.11.2, moment@^2.19.3: +moment@^2.11.2: version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== @@ -5702,15 +5684,6 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mv@~2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= - dependencies: - mkdirp "~0.5.1" - ncp "~2.0.0" - rimraf "~2.4.0" - mz@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -5720,11 +5693,6 @@ mz@^2.4.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.14.0: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== - nanoid@3.1.20: version "3.1.20" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" @@ -5757,11 +5725,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -ncp@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= - needle@^2.2.1: version "2.9.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" @@ -5787,12 +5750,12 @@ nest-router@^1.0.9: integrity sha512-ZyRdSVs9GczI+39B7tNXsxfBXQOYnEF6l/q2aLYG8wSEvRHRDXAlzZ1SIosDibM02pLahGkDNLFC+nZ8uzJGDQ== nest-winston@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/nest-winston/-/nest-winston-1.5.0.tgz#2a1d8c5e7f7abc933f10cd80e05548d03b63684b" - integrity sha512-hjJOZrzLbHe5BsN00OIi9Y7lT3ZMT4HX/1SbA5oKS0SkbjvvwxavpUz3N9itL6Oznh0B7JVjUXZLLK8aGULL0w== + version "1.6.2" + resolved "https://registry.yarnpkg.com/nest-winston/-/nest-winston-1.6.2.tgz#e4f24096b7e5cd9c8649b3d15203e576114d07e0" + integrity sha512-pM3o4zttpkKdnpNXyvMKKBD2u7OWROmVglyWZpH7O7QOLAegbMPvyqWgPNfvw2kkla+T/H4HFgGqcZGqiTzI5Q== dependencies: - cli-color "^2.0.0" - fast-safe-stringify "^2.0.7" + cli-color "^2.0.1" + fast-safe-stringify "^2.1.1" next-tick@1, next-tick@^1.1.0: version "1.1.0" @@ -5829,9 +5792,11 @@ node-emoji@1.10.0: lodash.toarray "^4.4.0" node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + version "2.6.6" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + dependencies: + whatwg-url "^5.0.0" node-gyp@3.x: version "3.8.0" @@ -5856,11 +5821,6 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - node-notifier@^8.0.0: version "8.0.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" @@ -5896,10 +5856,10 @@ node-preload@^0.2.1: dependencies: process-on-spawn "^1.0.0" -node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== node-version-compare@^1.0.3: version "1.0.3" @@ -6060,15 +6020,15 @@ object-hash@2.1.1: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== -object-hash@^2.0.1: +object-hash@2.2.0, object-hash@^2.0.1: version "2.2.0" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.10.3, object-inspect@^1.9.0: - version "1.10.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" - integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -6093,13 +6053,13 @@ object.assign@^4.1.2: object-keys "^1.1.1" object.entries@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" - integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.2" + es-abstract "^1.19.1" object.pick@^1.3.0: version "1.3.0" @@ -6108,14 +6068,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" - integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== +object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.2" + es-abstract "^1.19.1" on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" @@ -6253,7 +6213,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -6327,11 +6287,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parent-require@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977" - integrity sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc= - parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -6417,13 +6372,6 @@ path-to-regexp@3.2.0: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f" integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA== -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - dependencies: - pify "^3.0.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -6439,6 +6387,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -6450,11 +6403,9 @@ pify@^3.0.0: integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" + version "4.0.4" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6" + integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw== pkg-dir@^2.0.0: version "2.0.0" @@ -6470,13 +6421,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" - integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= - dependencies: - find-up "^2.1.0" - pluralize@8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" @@ -6516,16 +6460,6 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== - dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" - pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -6554,14 +6488,14 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" - integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" -proxy-addr@~2.0.5: +proxy-addr@~2.0.5, proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -6597,10 +6531,15 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@6.9.6: + version "6.9.6" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" + integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== + qs@^6.5.1: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== + version "6.10.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe" + integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw== dependencies: side-channel "^1.0.4" @@ -6636,6 +6575,16 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== + dependencies: + bytes "3.1.1" + http-errors "1.8.1" + iconv-lite "0.4.24" + unpipe "1.0.0" + rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -6646,24 +6595,11 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-is@^16.8.4: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= - dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" - read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -6673,15 +6609,6 @@ read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - read-pkg@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237" @@ -6711,7 +6638,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.7: +readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -6781,6 +6708,11 @@ reflect-metadata@^0.1.13: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== +regenerator-runtime@^0.13.4: + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== + regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -6884,7 +6816,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.18.1, resolve@^1.20.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -6924,13 +6856,6 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@~2.4.0: - version "2.4.5" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= - dependencies: - glob "^6.0.1" - rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" @@ -6967,16 +6892,11 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-json-stringify@~1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" - integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -6984,6 +6904,11 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +safe-stable-stringify@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" + integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -7025,12 +6950,12 @@ schema-utils@2.7.0: ajv "^6.12.2" ajv-keywords "^3.4.1" -schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== +schema-utils@^3.0.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -7075,13 +7000,39 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@5.0.1, serialize-javascript@^5.0.1: +send@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "1.8.1" + mime "1.6.0" + ms "2.1.3" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-javascript@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== dependencies: randombytes "^2.1.0" +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -7092,6 +7043,16 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.2" + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -7112,6 +7073,11 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + sha.js@^2.4.11: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -7168,9 +7134,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== simple-concat@^1.0.0: version "1.0.1" @@ -7198,11 +7164,6 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -7247,6 +7208,39 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +socket.io-adapter@~2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486" + integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ== + +socket.io-mock@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/socket.io-mock/-/socket.io-mock-1.3.2.tgz#3f6f56f9bc2a2852783bd8aae85159def5cd1942" + integrity sha512-p4MQBue3NAR8bXIHynRJxK/C+J3I3NpnnpgjptgLFSWv4u9Bdkubf2t0GCmyLmUTi03up0Cx/hQwzQfOpD187g== + dependencies: + component-emitter "^1.3.0" + +socket.io-parser@~4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" + integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== + dependencies: + "@types/component-emitter" "^1.2.10" + component-emitter "~1.3.0" + debug "~4.3.1" + +socket.io@*, socket.io@4.4.0, socket.io@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.4.0.tgz#8140a0db2c22235f88a6dceb867e4d5c9bd70507" + integrity sha512-bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ== + dependencies: + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.2" + engine.io "~6.1.0" + socket.io-adapter "~2.3.3" + socket.io-parser "~4.0.4" + source-list-map@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -7263,10 +7257,10 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== +source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -7335,9 +7329,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -7386,17 +7380,10 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= -stack-utils@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b" - integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ== - dependencies: - escape-string-regexp "^2.0.0" - stack-utils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277" - integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== dependencies: escape-string-regexp "^2.0.0" @@ -7455,6 +7442,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -7464,15 +7460,6 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -7529,12 +7516,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-bom@^3.0.0: version "3.0.0" @@ -7597,11 +7584,6 @@ supports-color@8.1.1, supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -7631,17 +7613,17 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -swagger-ui-dist@^3.18.1: - version "3.50.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.50.0.tgz#a06ace5820874ff9b337afb91bb08e76fcd12d57" - integrity sha512-BklniOBPlvZ6M9oGkhUwOf5HvxhkHBIycXN3ndju8WlLmi1xfMSdOA2AR6pNswlwURzsZUe1rh80aUyjnpD+Zw== +swagger-ui-dist@>=4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-4.1.3.tgz#2be9f9de9b5c19132fa4a5e40933058c151563dc" + integrity sha512-WvfPSfAAMlE/sKS6YkW47nX/hA7StmhYnAHc6wWCXNL0oclwLj6UXv0hQCkLnDgvebi0MEV40SJJpVjKUgH1IQ== swagger-ui-express@^4.1.4: - version "4.1.6" - resolved "https://registry.yarnpkg.com/swagger-ui-express/-/swagger-ui-express-4.1.6.tgz#682294af3d5c70f74a1fa4d6a9b503a9ee55ea82" - integrity sha512-Xs2BGGudvDBtL7RXcYtNvHsFtP1DBFPMJFRxHe5ez/VG/rzVOEjazJOOSc/kSCyxreCTKfJrII6MJlL9a6t8vw== + version "4.3.0" + resolved "https://registry.yarnpkg.com/swagger-ui-express/-/swagger-ui-express-4.3.0.tgz#226238ab231f7718f9109d63a66efc3a795618dd" + integrity sha512-jN46SEEe9EoXa3ZgZoKgnSF6z0w3tnM1yqhO4Y+Q4iZVc8JOQB960EZpIAz6rNROrDApVDwcMHR0mhlnc/5Omw== dependencies: - swagger-ui-dist "^3.18.1" + swagger-ui-dist ">=4.1.3" symbol-observable@3.0.0: version "3.0.0" @@ -7654,16 +7636,15 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.9: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + version "6.7.5" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238" + integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tapable@^1.0.0: version "1.1.3" @@ -7671,9 +7652,9 @@ tapable@^1.0.0: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tapable@^2.1.1, tapable@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" - integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== tar-fs@^2.0.0: version "2.1.1" @@ -7727,25 +7708,24 @@ terminal-link@^2.0.0: supports-hyperlinks "^2.0.0" terser-webpack-plugin@^5.1.1: - version "5.1.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz#30033e955ca28b55664f1e4b30a1347e61aa23af" - integrity sha512-cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A== + version "5.3.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" + integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== dependencies: - jest-worker "^27.0.2" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" + jest-worker "^27.4.1" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" source-map "^0.6.1" - terser "^5.7.0" + terser "^5.7.2" -terser@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" - integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== +terser@^5.7.2: + version "5.10.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" source-map "~0.7.2" - source-map-support "~0.5.19" + source-map-support "~0.5.20" test-exclude@^6.0.0: version "6.0.0" @@ -7805,10 +7785,10 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-fast-properties@^2.0.0: version "2.0.0" @@ -7852,6 +7832,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + tough-cookie@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" @@ -7876,6 +7861,11 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + tree-kill@1.2.2, tree-kill@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" @@ -7948,7 +7938,7 @@ ts-node@^9.1.1: source-map-support "^0.5.17" yn "3.1.1" -tsconfig-paths-webpack-plugin@3.5.1, tsconfig-paths-webpack-plugin@^3.3.0: +tsconfig-paths-webpack-plugin@3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.1.tgz#e4dbf492a20dca9caab60086ddacb703afc2b726" integrity sha512-n5CMlUUj+N5pjBhBACLq4jdr9cPTitySCjIosoQm0zwK99gmrcTGAfY9CwxRFT9+9OleNWXPRUcxsKP4AYExxQ== @@ -7957,7 +7947,16 @@ tsconfig-paths-webpack-plugin@3.5.1, tsconfig-paths-webpack-plugin@^3.3.0: enhanced-resolve "^5.7.0" tsconfig-paths "^3.9.0" -tsconfig-paths@3.9.0, tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0: +tsconfig-paths-webpack-plugin@^3.3.0: + version "3.5.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a" + integrity sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.7.0" + tsconfig-paths "^3.9.0" + +tsconfig-paths@3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== @@ -7967,15 +7966,25 @@ tsconfig-paths@3.9.0, tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tsconfig-paths@^3.11.0, tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" + integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== -tslib@>=1.9.0, tslib@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== +tslib@2.3.1, tslib@>=1.9.0, tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" @@ -8053,7 +8062,7 @@ type@^1.0.1: resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== -type@^2.0.0: +type@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw== @@ -8071,15 +8080,15 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typeorm@^0.2.29: - version "0.2.34" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.34.tgz#637b3cec2de54ee7f423012b813a2022c0aacc8b" - integrity sha512-FZAeEGGdSGq7uTH3FWRQq67JjKu0mgANsSZ04j3kvDYNgy9KwBl/6RFgMVgiSgjf7Rqd7NrhC2KxVT7I80qf7w== + version "0.2.41" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.41.tgz#88758101ac158dc0a0a903d70eaacea2974281cc" + integrity sha512-/d8CLJJxKPgsnrZWiMyPI0rz2MFZnBQrnQ5XP3Vu3mswv2WPexb58QM6BEtmRmlTMYN5KFWUz8SKluze+wS9xw== dependencies: "@sqltools/formatter" "^1.2.2" app-root-path "^3.0.0" buffer "^6.0.3" chalk "^4.1.0" - cli-highlight "^2.1.10" + cli-highlight "^2.1.11" debug "^4.3.1" dotenv "^8.2.0" glob "^7.1.6" @@ -8089,8 +8098,7 @@ typeorm@^0.2.29: sha.js "^2.4.11" tslib "^2.1.0" xml2js "^0.4.23" - yargonaut "^1.1.4" - yargs "^16.2.0" + yargs "^17.0.1" zen-observable-ts "^1.0.0" typescript@4.2.3: @@ -8099,9 +8107,9 @@ typescript@4.2.3: integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== typescript@^4.0.5: - version "4.3.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" - integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== + version "4.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8" + integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg== unbox-primitive@^1.0.1: version "1.0.1" @@ -8249,16 +8257,16 @@ w3c-xmlserializer@^2.0.0: xml-name-validator "^3.0.0" walker@^1.0.7, walker@~1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== dependencies: - makeerror "1.0.x" + makeerror "1.0.12" watchpack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" - integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -8270,6 +8278,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -8286,9 +8299,9 @@ webpack-node-externals@2.5.2: integrity sha512-aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w== webpack-sources@^2.1.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" - integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ== + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" + integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -8334,10 +8347,18 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" - integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: lodash "^4.7.0" tr46 "^2.1.0" @@ -8373,13 +8394,20 @@ which@2.0.2, which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@1.1.3, wide-align@^1.1.0: +wide-align@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== dependencies: string-width "^1.0.2 || 2" +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + windows-release@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-4.0.0.tgz#4725ec70217d1bf6e02c7772413b29cdde9ec377" @@ -8398,11 +8426,12 @@ winston-daily-rotate-file@^4.5.0: winston-transport "^4.4.0" winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== + version "4.4.1" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.1.tgz#42a830e07363719c13c12bd2fb87a226f692dc75" + integrity sha512-ciZRlU4CSjHqHe8RQG1iPxKMRVwv6ZJ0RC7DxStKWd0KjpAhPDy5gVYSCpIUq+5CUsP+IyNOTZy1X0tO2QZqjg== dependencies: - readable-stream "^2.3.7" + logform "^2.2.0" + readable-stream "^3.4.0" triple-beam "^1.2.0" winston@^3.3.3: @@ -8472,10 +8501,15 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.4.5: - version "7.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" - integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== +ws@^7.4.6: + version "7.5.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" + integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== + +ws@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== xml-name-validator@^3.0.0: version "3.0.0" @@ -8535,24 +8569,15 @@ yaml@^1.7.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargonaut@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/yargonaut/-/yargonaut-1.1.4.tgz#c64f56432c7465271221f53f5cc517890c3d6e0c" - integrity sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA== - dependencies: - chalk "^1.1.1" - figlet "^1.1.1" - parent-require "^1.0.0" - yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== yargs-parser@20.x, yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs-parser@^13.1.2: version "13.1.2" @@ -8570,6 +8595,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== + yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" @@ -8580,7 +8610,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.0.0, yargs@^16.2.0: +yargs@16.2.0, yargs@^16.0.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -8626,6 +8656,19 @@ yargs@^15.0.2, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" +yargs@^17.0.1: + version "17.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.0.tgz#295c4ffd0eef148ef3e48f7a2e0f58d0e4f26b1c" + integrity sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" @@ -8642,14 +8685,14 @@ yocto-queue@^0.1.0: integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== zen-observable-ts@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.0.0.tgz#30d1202b81d8ba4c489e3781e8ca09abf0075e70" - integrity sha512-KmWcbz+9kKUeAQ8btY8m1SsEFgBcp7h/Uf3V5quhan7ZWdjGsf0JcGLULQiwOZibbFWnHkYq8Nn2AZbJabovQg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83" + integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA== dependencies: - "@types/zen-observable" "^0.8.2" - zen-observable "^0.8.15" + "@types/zen-observable" "0.8.3" + zen-observable "0.8.15" -zen-observable@^0.8.15: +zen-observable@0.8.15: version "0.8.15" resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== diff --git a/redisinsight/main.dev.ts b/redisinsight/main.dev.ts index 1195c401ef..1acf593940 100644 --- a/redisinsight/main.dev.ts +++ b/redisinsight/main.dev.ts @@ -138,6 +138,14 @@ const bootstrap = async () => { export const windows = new Set(); +const getAssetPath = (...paths: string[]): string => { + const RESOURCES_PATH = app.isPackaged + ? path.join(process.resourcesPath, 'resources') + : path.join(__dirname, '../resources'); + + return path.join(RESOURCES_PATH, ...paths); +}; + const titleSplash = 'RedisInsight'; export const createSplashScreen = async () => { const splash = new BrowserWindow({ @@ -148,6 +156,11 @@ export const createSplashScreen = async () => { resizable: false, alwaysOnTop: true, title: titleSplash, + icon: getAssetPath('icon.png'), + webPreferences: { + nodeIntegration: true, + contextIsolation: false, + }, }); splash.loadURL(`file://${__dirname}/splash.html`); @@ -156,12 +169,6 @@ export const createSplashScreen = async () => { }; export const createWindow = async (splash: BrowserWindow | null = null) => { - const RESOURCES_PATH = app.isPackaged - ? path.join(process.resourcesPath, 'resources') - : path.join(__dirname, '../resources'); - - const getAssetPath = (...paths: string[]): string => path.join(RESOURCES_PATH, ...paths); - let x; let y; const currentWindow = BrowserWindow.getFocusedWindow(); @@ -374,6 +381,8 @@ app.on('certificate-error', (event, _webContents, _url, _error, _certificate, ca }); // ipc events +ipcMain.handle(ipcEvent.getAppVersion, () => app?.getVersion()); + ipcMain.handle(ipcEvent.getStoreValue, (_event, key) => store?.get(key)); ipcMain.handle(ipcEvent.deleteStoreValue, (_event, key) => store?.delete(key)); diff --git a/redisinsight/package.json b/redisinsight/package.json index d7ddbcae9b..cc451cebfd 100644 --- a/redisinsight/package.json +++ b/redisinsight/package.json @@ -2,7 +2,7 @@ "name": "redisinsight", "productName": "RedisInsight", "private": true, - "version": "2.0.3-preview", + "version": "2.0.4-preview", "description": "RedisInsight", "main": "./main.prod.js", "author": { diff --git a/redisinsight/splash.html b/redisinsight/splash.html index b25a28ad9b..1c1316d1c7 100644 --- a/redisinsight/splash.html +++ b/redisinsight/splash.html @@ -12,21 +12,39 @@ height: 100%; background-size: cover; color: #ffffff; - background-image: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/7AARRHVja3kAAQAEAAAAPAAA/+EDL2h0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZWRhMmIzZmFjLCAyMDIxLzExLzE3LTE3OjIzOjE5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjMuMSAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkQyQTg3MDY2M0RGMTFFQ0IzMDE5MTczRjQ1RjM4RTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkQyQTg3MDc2M0RGMTFFQ0IzMDE5MTczRjQ1RjM4RTYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCRDJBODcwNDYzREYxMUVDQjMwMTkxNzNGNDVGMzhFNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCRDJBODcwNTYzREYxMUVDQjMwMTkxNzNGNDVGMzhFNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/bAEMABAMDBAMDBAQEBAUFBAUHCwcHBgYHDgoKCAsQDhEREA4QDxIUGhYS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); + /*background-image: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/7AARRHVja3kAAQAEAAAAPAAA/+EDL2h0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNy4xLWMwMDAgNzkuZWRhMmIzZmFjLCAyMDIxLzExLzE3LTE3OjIzOjE5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjMuMSAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkQyQTg3MDY2M0RGMTFFQ0IzMDE5MTczRjQ1RjM4RTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkQyQTg3MDc2M0RGMTFFQ0IzMDE5MTczRjQ1RjM4RTYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCRDJBODcwNDYzREYxMUVDQjMwMTkxNzNGNDVGMzhFNiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCRDJBODcwNTYzREYxMUVDQjMwMTkxNzNGNDVGMzhFNiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/bAEMABAMDBAMDBAQEBAUFBAUHCwcHBgYHDgoKCAsQDhEREA4QDxIUGhYS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);*/ } - .container { - width: 400px; - text-align: center; - margin: 0 auto; + .DARK { + background-color: #202020; + color: #ffffff; } - #Group_4 { + .LIGHT { + background-color: #FFFFFF; + color: #202020; + } + + .DARK #Group_4 { fill: #FFFFFF; } - .copyright { - color: #ffffff + .LIGHT #Group_4 { + fill: #202020; + } + + .DARK .copyright { + color: #B4B4B4 + } + + .LIGHT .copyright { + color: #69707D + } + + .container { + width: 400px; + text-align: center; + margin: 0 auto; } .logo { @@ -74,17 +92,31 @@ - RedisInsight 2.0.3-preview © 2021 Redis Ltd. + diff --git a/redisinsight/ui/src/App.tsx b/redisinsight/ui/src/App.tsx index 61b458b345..088fe6350a 100644 --- a/redisinsight/ui/src/App.tsx +++ b/redisinsight/ui/src/App.tsx @@ -7,7 +7,7 @@ import Router from './Router' import store from './slices/store' import { Theme } from './constants' import { themeService } from './services' -import { NavigationMenu, Notifications, Config, ShortcutsFlyout } from './components' +import { NavigationMenu, Notifications, Config, ShortcutsFlyout, MonitorConfig } from './components' import { ThemeProvider } from './contexts/themeContext' import MainComponent from './components/main/MainComponent' @@ -26,6 +26,7 @@ const App = ({ children }: { children?: ReactElement }) => (
+ diff --git a/redisinsight/ui/src/assets/img/NYbg.jpg b/redisinsight/ui/src/assets/img/NYbg.jpg deleted file mode 100644 index 04b7299e35..0000000000 Binary files a/redisinsight/ui/src/assets/img/NYbg.jpg and /dev/null differ diff --git a/redisinsight/ui/src/assets/img/overview/input_dark.svg b/redisinsight/ui/src/assets/img/overview/input_dark.svg new file mode 100644 index 0000000000..8da876cbe9 --- /dev/null +++ b/redisinsight/ui/src/assets/img/overview/input_dark.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + diff --git a/redisinsight/ui/src/assets/img/overview/memory_tip.svg b/redisinsight/ui/src/assets/img/overview/memory_tip.svg new file mode 100644 index 0000000000..f7a4b8f7be --- /dev/null +++ b/redisinsight/ui/src/assets/img/overview/memory_tip.svg @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/redisinsight/ui/src/assets/img/overview/output_dark.svg b/redisinsight/ui/src/assets/img/overview/output_dark.svg new file mode 100644 index 0000000000..4ca1eb6c9f --- /dev/null +++ b/redisinsight/ui/src/assets/img/overview/output_dark.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + diff --git a/redisinsight/ui/src/components/bottom-group-components/BottomGroupComponents.tsx b/redisinsight/ui/src/components/bottom-group-components/BottomGroupComponents.tsx index d24d1f4129..26bdec6bbf 100644 --- a/redisinsight/ui/src/components/bottom-group-components/BottomGroupComponents.tsx +++ b/redisinsight/ui/src/components/bottom-group-components/BottomGroupComponents.tsx @@ -4,12 +4,15 @@ import cx from 'classnames' import { cliSettingsSelector } from 'uiSrc/slices/cli/cli-settings' import CliWrapper from 'uiSrc/components/cli/CliWrapper' import CommandHelperWrapper from 'uiSrc/components/command-helper/CommandHelperWrapper' +import { MonitorWrapper } from 'uiSrc/components' +import { monitorSelector } from 'uiSrc/slices/cli/monitor' import BottomGroupMinimized from './components/bottom-group-minimized/BottomGroupMinimized' import styles from './styles.module.scss' const BottomGroupComponents = () => { const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector) + const { isShowMonitor } = useSelector(monitorSelector) return (
@@ -20,6 +23,11 @@ const BottomGroupComponents = () => {
)} + {isShowMonitor && ( +
+ +
+ )}
diff --git a/redisinsight/ui/src/components/bottom-group-components/components/bottom-group-minimized/BottomGroupMinimized.tsx b/redisinsight/ui/src/components/bottom-group-components/components/bottom-group-minimized/BottomGroupMinimized.tsx index ccb79c4318..9a2f6265f0 100644 --- a/redisinsight/ui/src/components/bottom-group-components/components/bottom-group-minimized/BottomGroupMinimized.tsx +++ b/redisinsight/ui/src/components/bottom-group-components/components/bottom-group-minimized/BottomGroupMinimized.tsx @@ -13,6 +13,7 @@ import { toggleHideCliHelper, } from 'uiSrc/slices/cli/cli-settings' import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' +import { monitorSelector, toggleHideMonitor, toggleMonitor } from 'uiSrc/slices/cli/monitor' import styles from '../../styles.module.scss' @@ -24,6 +25,10 @@ const BottomGroupMinimized = () => { isShowHelper, isMinimizedHelper, } = useSelector(cliSettingsSelector) + const { + isShowMonitor, + isMinimizedMonitor, + } = useSelector(monitorSelector) const dispatch = useDispatch() useEffect(() => @@ -53,6 +58,11 @@ const BottomGroupMinimized = () => { dispatch(toggleCliHelper()) } + const handleExpandMonitor = () => { + isMinimizedMonitor && dispatch(toggleHideMonitor()) + dispatch(toggleMonitor()) + } + return (
{ Command Helper + + + + Profiler + +
) diff --git a/redisinsight/ui/src/components/bottom-group-components/styles.module.scss b/redisinsight/ui/src/components/bottom-group-components/styles.module.scss index b4ef8f3207..e675ec53e8 100644 --- a/redisinsight/ui/src/components/bottom-group-components/styles.module.scss +++ b/redisinsight/ui/src/components/bottom-group-components/styles.module.scss @@ -59,10 +59,19 @@ } } - .helperWrapper { width: 100%; max-width: 360px; + min-width: 230px; + &.fullWidth { + max-width: 100%; + } +} + +.monitorWrapper { + width: 100%; + max-width: 628px; + min-width: 230px; &.fullWidth { max-width: 100%; } diff --git a/redisinsight/ui/src/components/cli/Cli/Cli.spec.tsx b/redisinsight/ui/src/components/cli/Cli/Cli.spec.tsx index 7d07cd5166..c12b3c3f03 100644 --- a/redisinsight/ui/src/components/cli/Cli/Cli.spec.tsx +++ b/redisinsight/ui/src/components/cli/Cli/Cli.spec.tsx @@ -1,5 +1,6 @@ import React from 'react' -import { render } from 'uiSrc/utils/test-utils' +import { keys } from '@elastic/eui' +import { fireEvent, render, screen } from 'uiSrc/utils/test-utils' import CLI from './Cli' const redisCommandsPath = 'uiSrc/slices/app/redis-commands' @@ -18,4 +19,11 @@ describe('CLI', () => { it('should render', () => { expect(render()).toBeTruthy() }) + it('on "Esc" key should focus to "close-cli" button', () => { + const { getByTestId } = render() + + fireEvent.keyDown(getByTestId('cli-command'), {key: keys.ESCAPE}) + + expect(getByTestId('close-cli')).toHaveFocus() + }) }) diff --git a/redisinsight/ui/src/components/cli/Cli/styles.module.scss b/redisinsight/ui/src/components/cli/Cli/styles.module.scss index 92f31f1508..72d56d283e 100644 --- a/redisinsight/ui/src/components/cli/Cli/styles.module.scss +++ b/redisinsight/ui/src/components/cli/Cli/styles.module.scss @@ -5,6 +5,7 @@ .container { height: 100%; width: 100%; + min-width: 230px; } .main { @@ -13,7 +14,7 @@ height: 100%; width: 100%; position: relative; - background-color: var(--euiColorEmptyShade); + background-color: var(--browserTableRowEven); border-left: 1px solid var(--euiColorLightShade); border-right: 1px solid var(--euiColorLightShade); border-top: 1px solid var(--euiColorLightShade); diff --git a/redisinsight/ui/src/components/cli/CliWrapper.spec.tsx b/redisinsight/ui/src/components/cli/CliWrapper.spec.tsx index 2d94d17571..e11a34f5d6 100644 --- a/redisinsight/ui/src/components/cli/CliWrapper.spec.tsx +++ b/redisinsight/ui/src/components/cli/CliWrapper.spec.tsx @@ -4,6 +4,11 @@ import { processCliClient, setCliEnteringCommand } from 'uiSrc/slices/cli/cli-se import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils' import CliWrapper from './CliWrapper' +jest.mock('uiSrc/slices/cli/cli-output', () => ({ + ...jest.requireActual('uiSrc/slices/cli/cli-output'), + concatToOutput: () => jest.fn(), +})) + const redisCommandsPath = 'uiSrc/slices/app/redis-commands' let store: typeof mockedStore diff --git a/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.spec.tsx b/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.spec.tsx index d7034251dd..c1148f34d9 100644 --- a/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.spec.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.spec.tsx @@ -4,7 +4,6 @@ import { keys } from '@elastic/eui' import { instance, mock } from 'ts-mockito' import { cleanup, fireEvent, mockedStore, render, screen } from 'uiSrc/utils/test-utils' import { clearOutput, updateCliHistoryStorage } from 'uiSrc/utils/cliHelper' -import CLI from 'uiSrc/components/cli/Cli' import { MOCK_COMMANDS_ARRAY } from 'uiSrc/constants' import CliBody, { Props } from './CliBody' @@ -237,16 +236,6 @@ describe('CliBody', () => { expect(onSubmitMock).not.toBeCalled() }) - it('"Esc" key should focus ', () => { - render() - - fireEvent.keyDown(screen.getByTestId(cliCommand), { - key: keys.ESCAPE, - }) - - expect(screen.getByTestId('close-cli')).toHaveFocus() - }) - it('"Tab" with command="" should setCommand first command from constants/commands ', () => { const onSubmitMock = jest.fn() const setCommandMock = jest.fn() diff --git a/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.tsx b/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.tsx index b0a3ea2b72..92ea09205b 100644 --- a/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.tsx @@ -231,7 +231,7 @@ const CliBody = (props: Props) => {
{data}
{!error && !(loading || settingsLoading) ? ( - + ({ connectedInstanceSelector: jest.fn().mockReturnValue({ id: '123', connectionType: 'STANDALONE', + db: 0, }), })) @@ -50,6 +48,7 @@ jest.mock('uiSrc/slices/cli/cli-output', () => ({ sendCliClusterCommandAction: jest.fn(), processUnsupportedCommand: jest.fn(), updateCliCommandHistory: jest.fn, + concatToOutput: () => jest.fn(), })) jest.mock('uiSrc/utils/cliHelper', () => ({ @@ -63,39 +62,27 @@ jest.mock('uiSrc/utils/cliHelper', () => ({ const unsupportedCommands = ['sync', 'subscription'] const cliCommandTestId = 'cli-command' -jest.mock('uiSrc/slices/cli/cli-settings', () => ({ - ...jest.requireActual('uiSrc/slices/cli/cli-settings'), - cliSettingsSelector: jest.fn().mockReturnValue({ - unsupportedCommands, - matchedCommand: 'get', - isEnteringCommand: true, - isShowHelper: true, - }), +jest.mock('react-redux', () => ({ + ...jest.requireActual('react-redux'), + useSelector: jest.fn() })) describe('CliBodyWrapper', () => { - it('should render', () => { - expect(render()).toBeTruthy() - }) - - it('should render with SessionStorage', () => { - render() - - const expectedActions = [concatToOutput(InitOutputText('', 0)), processCliClient()] - expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual( - clearStoreActions(expectedActions) - ) + beforeEach(() => { + const state: any = store.getState(); + + (useSelector as jest.Mock).mockImplementation((callback: (arg0: any) => any) => callback({ + ...state, + cli: { + ...state.cli, + settings: { ...state.cli.settings, loading: false } + } + })) }) + it('should render and call process cli client', () => { + const expectedActions = [processCliClient()] - it('"onSubmit" should be called after keyDown Enter', () => { - render() - - fireEvent.keyDown(screen.getByTestId(cliCommandTestId), { - key: 'Enter', - }) - - const expectedActions = [concatToOutput(InitOutputText('', 0)), processCliClient()] - + expect(render()).toBeTruthy() expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual( clearStoreActions(expectedActions) ) @@ -105,9 +92,9 @@ describe('CliBodyWrapper', () => { // or any testing library that uses js - dom, because of a limitation on js - dom itself. // https://github.com/testing-library/dom-testing-library/pull/235 it.skip('"onSubmit" should check unsupported commands', () => { - const processUnsupportedCommandMock = jest.fn() + const processUnsupportedCommandMock = jest.fn(); - processUnsupportedCommand.mockImplementation(() => processUnsupportedCommandMock) + (processUnsupportedCommand as jest.Mock).mockImplementation(() => processUnsupportedCommandMock) render() @@ -125,14 +112,15 @@ describe('CliBodyWrapper', () => { }) it('"onSubmit" for Cluster connection should call "sendCliClusterCommandAction"', () => { - connectedInstanceSelector.mockImplementation(() => ({ + (connectedInstanceSelector as jest.Mock).mockImplementation(() => ({ id: '123', connectionType: 'CLUSTER', + db: 0, })) - const sendCliClusterActionMock = jest.fn() + const sendCliClusterActionMock = jest.fn(); - sendCliClusterCommandAction.mockImplementation(() => sendCliClusterActionMock) + (sendCliClusterCommandAction as jest.Mock).mockImplementation(() => sendCliClusterActionMock) render() diff --git a/redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx b/redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx index 3b83085ffb..f0210ab0de 100644 --- a/redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx @@ -1,5 +1,3 @@ -import { EuiTextColor } from '@elastic/eui' -import { isEmpty } from 'lodash' import { decode } from 'html-entities' import React, { useEffect, useState } from 'react' import { useSelector, useDispatch } from 'react-redux' @@ -18,14 +16,18 @@ import { sendCliCommandAction, sendCliClusterCommandAction, processUnsupportedCommand, + processUnrepeatableNumber, + processMonitorCommand, } from 'uiSrc/slices/cli/cli-output' -import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' +import { CommandMonitor } from 'uiSrc/constants' +import { getCommandRepeat, isRepeatCountCorrect } from 'uiSrc/utils' import { ConnectionType } from 'uiSrc/slices/interfaces' import { ClusterNodeRole } from 'uiSrc/slices/interfaces/cli' import { connectedInstanceSelector } from 'uiSrc/slices/instances' -import { checkUnsupportedCommand, clearOutput } from 'uiSrc/utils/cliHelper' -import { InitOutputText, ConnectionSuccessOutputText } from 'uiSrc/constants/cliOutput' +import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' +import { checkUnsupportedCommand, clearOutput, cliCommandOutput } from 'uiSrc/utils/cliHelper' import { SendClusterCommandDto } from 'apiSrc/modules/cli/dto/cli.dto' + import CliBody from './CliBody' import styles from './CliBody/styles.module.scss' @@ -45,13 +47,10 @@ const CliBodyWrapper = () => { cliClientUuid, } = useSelector(cliSettingsSelector) const { host, port, connectionType } = useSelector(connectedInstanceSelector) + const { db: currentDbIndex } = useSelector(outputSelector) useEffect(() => { - if (isEmpty(data) || error) { - dispatch(concatToOutput(InitOutputText(host, port))) - } - - !cliClientUuid && dispatch(createCliClientAction(onSuccess, onFail)) + !cliClientUuid && dispatch(createCliClientAction()) }, []) useEffect(() => { @@ -69,34 +68,30 @@ const CliBodyWrapper = () => { const refHotkeys = useHotkeys('command+k,ctrl+l', handleClearOutput) - const onSuccess = () => { - if (isEmpty(data) || error) { - dispatch(concatToOutput(ConnectionSuccessOutputText)) - } - } - - const onFail = (message: string) => { - dispatch( - concatToOutput([ - '\n', - - {message} - , - '\n\n', - ]) - ) - } - const handleSubmit = () => { - const commandLine = decode(command).trim() + const [commandLine, countRepeat] = getCommandRepeat(decode(command).trim()) const unsupportedCommand = checkUnsupportedCommand(unsupportedCommands, commandLine) + dispatch(concatToOutput(cliCommandOutput(command, currentDbIndex))) + + if (!isRepeatCountCorrect(countRepeat)) { + dispatch(processUnrepeatableNumber(commandLine, resetCommand)) + return + } + + // Flow if monitor command was executed + if (checkUnsupportedCommand([CommandMonitor.toLowerCase()], commandLine)) { + dispatch(processMonitorCommand(commandLine, resetCommand)) + return + } if (unsupportedCommand) { dispatch(processUnsupportedCommand(commandLine, unsupportedCommand, resetCommand)) return } - sendCommand(commandLine) + for (let i = 0; i < countRepeat; i++) { + sendCommand(commandLine) + } } const sendCommand = (command: string) => { diff --git a/redisinsight/ui/src/components/cli/components/cli-header/CliHeader.tsx b/redisinsight/ui/src/components/cli/components/cli-header/CliHeader.tsx index 6bf6d9d1cd..33280813d0 100644 --- a/redisinsight/ui/src/components/cli/components/cli-header/CliHeader.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-header/CliHeader.tsx @@ -21,7 +21,7 @@ import { BrowserStorageItem } from 'uiSrc/constants' import { sessionStorageService } from 'uiSrc/services' import { connectedInstanceSelector } from 'uiSrc/slices/instances' import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' -import { resetOutputLoading } from 'uiSrc/slices/cli/cli-output' +import { outputSelector, resetOutputLoading } from 'uiSrc/slices/cli/cli-output' import styles from './styles.module.scss' @@ -31,7 +31,8 @@ const CliHeader = () => { const { instanceId = '' } = useParams<{ instanceId: string }>() const { host, port } = useSelector(connectedInstanceSelector) - const endpoint = `${host}:${port}` + const { db } = useSelector(outputSelector) + const endpoint = db > 0 ? `${host}:${port}[${db}]` : `${host}:${port}` const removeCliClient = () => { const cliClientUuid = sessionStorageService.get(BrowserStorageItem.cliClientUuid) ?? '' diff --git a/redisinsight/ui/src/components/cli/components/cli-header/styles.module.scss b/redisinsight/ui/src/components/cli/components/cli-header/styles.module.scss index 851bee1741..b6d575eb78 100644 --- a/redisinsight/ui/src/components/cli/components/cli-header/styles.module.scss +++ b/redisinsight/ui/src/components/cli/components/cli-header/styles.module.scss @@ -3,10 +3,9 @@ line-height: 34px; width: 100%; overflow: hidden; - background-color: var(--browserTableRowEven); + background-color: var(--euiPageBackgroundColor); - padding-left: 18px; - padding-right: 18px; + padding: 0 10px 0 16px; z-index: 10; } diff --git a/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.spec.tsx b/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.spec.tsx index ac55b26727..2a3d9efd04 100644 --- a/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.spec.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.spec.tsx @@ -18,6 +18,21 @@ describe('CliInput', () => { expect(render()).toBeTruthy() }) + it('should render db index if it is greater than 0', () => { + const { queryByTestId } = render() + const dbIndexEl = queryByTestId('cli-db-index') + + expect(dbIndexEl).toBeInTheDocument() + expect(dbIndexEl).toHaveTextContent('[1]') + }) + + it('should not render db index if it is 0', () => { + const { queryByTestId } = render() + const dbIndexEl = queryByTestId('cli-db-index') + + expect(dbIndexEl).not.toBeInTheDocument() + }) + // It's not possible to simulate events on contenteditable with testing-react-library, // or any testing library that uses js - dom, because of a limitation on js - dom itself. // https://github.com/testing-library/dom-testing-library/pull/235 diff --git a/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.tsx b/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.tsx index 0bba04edb6..d1ec4d4eb0 100644 --- a/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.tsx +++ b/redisinsight/ui/src/components/cli/components/cli-input/CliInput/CliInput.tsx @@ -11,10 +11,11 @@ export interface Props { setInputEl: Function; setCommand: (command: string) => void; onKeyDown: (event: React.KeyboardEvent) => void; + dbIndex: number; } const CliInput = (props: Props) => { - const { command = '', setInputEl, setCommand, onKeyDown } = props + const { command = '', setInputEl, setCommand, onKeyDown, dbIndex = 0 } = props const onMouseUp = (event: React.MouseEvent) => { event.stopPropagation() @@ -26,7 +27,10 @@ const CliInput = (props: Props) => { return ( <> - >  + + {dbIndex !== 0 && {`[${dbIndex}] `}} + >  + { const { command = '', wordsTyped, setInputEl, setCommand, onKeyDown } = props const { spec: ALL_REDIS_COMMANDS } = useSelector(appRedisCommandsSelector) - const [firstCommand, secondCommand] = command.split(' ') + const { db } = useSelector(outputSelector) + + const [commandLine, repeatCommand] = getCommandRepeat(command) + const [firstCommand, secondCommand] = commandLine.split(' ') const firstCommandMatch = firstCommand.toUpperCase() const secondCommandMatch = `${firstCommandMatch} ${secondCommand ? secondCommand.toUpperCase() : null}` @@ -33,9 +38,14 @@ const CliInputWrapper = (props: Props) => { setInputEl={setInputEl} setCommand={setCommand} onKeyDown={onKeyDown} + dbIndex={db} /> {matchedCmd && ( - + )} ) diff --git a/redisinsight/ui/src/components/command-helper/CommandHelper/CommandHelper.tsx b/redisinsight/ui/src/components/command-helper/CommandHelper/CommandHelper.tsx index 5f66faa5a5..dc1bddf13d 100644 --- a/redisinsight/ui/src/components/command-helper/CommandHelper/CommandHelper.tsx +++ b/redisinsight/ui/src/components/command-helper/CommandHelper/CommandHelper.tsx @@ -37,7 +37,7 @@ const CommandHelper = (props: Props) => { } = props const readMore = (commandName = '') => { - const docUrl = getDocUrlForCommand(commandName, group) + const docUrl = getDocUrlForCommand(commandName) return ( { > - Command Helper + Command Helper diff --git a/redisinsight/ui/src/components/command-helper/CommandHelperHeader/styles.module.scss b/redisinsight/ui/src/components/command-helper/CommandHelperHeader/styles.module.scss index 0b351a2a2c..1776972913 100644 --- a/redisinsight/ui/src/components/command-helper/CommandHelperHeader/styles.module.scss +++ b/redisinsight/ui/src/components/command-helper/CommandHelperHeader/styles.module.scss @@ -3,10 +3,9 @@ line-height: 34px; width: 100%; overflow: hidden; - background-color: var(--browserTableRowEven); + background-color: var(--euiPageBackgroundColor); - padding-left: 18px; - padding-right: 18px; + padding: 0 10px 0 16px; z-index: 10; } diff --git a/redisinsight/ui/src/components/database-list-modules/DatabaseListModules.tsx b/redisinsight/ui/src/components/database-list-modules/DatabaseListModules.tsx index 4f55b37900..66c402e3fa 100644 --- a/redisinsight/ui/src/components/database-list-modules/DatabaseListModules.tsx +++ b/redisinsight/ui/src/components/database-list-modules/DatabaseListModules.tsx @@ -1,8 +1,6 @@ -/* eslint-disable import/no-webpack-loader-syntax */ import React, { useContext } from 'react' import { EuiButton, EuiButtonIcon, EuiToolTip } from '@elastic/eui' import cx from 'classnames' -import { isNumber } from 'lodash' import { RedisDefaultModules, @@ -36,7 +34,6 @@ export interface Props { modules: RedisModuleDto[]; inCircle?: boolean; dark?: boolean; - maxLength?: number; } interface ITooltipProps { @@ -44,53 +41,51 @@ interface ITooltipProps { content: any; abbreviation?: string; } +export const modulesDefaultInit = { + [RedisDefaultModules.AI]: { + iconDark: RedisAIDark, + iconLight: RedisAILight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.AI], + }, + [RedisDefaultModules.Bloom]: { + iconDark: RedisBloomDark, + iconLight: RedisBloomLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Bloom], + }, + [RedisDefaultModules.Gears]: { + iconDark: RedisGearsDark, + iconLight: RedisGearsLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Gears], + }, + [RedisDefaultModules.Graph]: { + iconDark: RedisGraphDark, + iconLight: RedisGraphLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Graph], + }, + [RedisDefaultModules.ReJSON]: { + iconDark: RedisJSONDark, + iconLight: RedisJSONLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.ReJSON], + }, + [RedisDefaultModules.Search]: { + iconDark: RedisSearchDark, + iconLight: RedisSearchLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Search], + }, + [RedisDefaultModules.TimeSeries]: { + iconDark: RedisTimeSeriesDark, + iconLight: RedisTimeSeriesLight, + text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.TimeSeries], + }, +} -const DatabaseListModules = React.memo(({ modules: modulesProp, inCircle, maxLength }: Props) => { - const modules = isNumber(maxLength) ? modulesProp.slice(0, maxLength) : modulesProp +const DatabaseListModules = React.memo(({ modules, inCircle }: Props) => { const { theme } = useContext(ThemeContext) const handleCopy = (text = '') => { navigator?.clipboard?.writeText(text) } - const modulesDefaultInit = { - [RedisDefaultModules.AI]: { - iconDark: RedisAIDark, - iconLight: RedisAILight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.AI], - }, - [RedisDefaultModules.Bloom]: { - iconDark: RedisBloomDark, - iconLight: RedisBloomLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Bloom], - }, - [RedisDefaultModules.Gears]: { - iconDark: RedisGearsDark, - iconLight: RedisGearsLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Gears], - }, - [RedisDefaultModules.Graph]: { - iconDark: RedisGraphDark, - iconLight: RedisGraphLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Graph], - }, - [RedisDefaultModules.ReJSON]: { - iconDark: RedisJSONDark, - iconLight: RedisJSONLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.ReJSON], - }, - [RedisDefaultModules.Search]: { - iconDark: RedisSearchDark, - iconLight: RedisSearchLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Search], - }, - [RedisDefaultModules.TimeSeries]: { - iconDark: RedisTimeSeriesDark, - iconLight: RedisTimeSeriesLight, - text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.TimeSeries], - }, - } - const Tooltip = ({ icon, content, abbreviation }: ITooltipProps) => ( <> { it('should render', () => { expect(render( - + )).toBeTruthy() }) }) diff --git a/redisinsight/ui/src/components/database-overview/DatabaseOverview.tsx b/redisinsight/ui/src/components/database-overview/DatabaseOverview.tsx index d027f06b7f..3a362f1b6b 100644 --- a/redisinsight/ui/src/components/database-overview/DatabaseOverview.tsx +++ b/redisinsight/ui/src/components/database-overview/DatabaseOverview.tsx @@ -1,47 +1,146 @@ -import React from 'react' +import React, { useEffect, useState } from 'react' import cx from 'classnames' import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiToolTip } from '@elastic/eui' +import MoreInfoPopover from 'uiSrc/components/database-overview/components/MoreInfoPopover' +import { RedisModuleDto } from 'apiSrc/modules/instances/dto/database-instance.dto' +import { getResolutionLimits } from './utils/resolutionHelper' +import { IMetric } from './components/OverviewMetrics' +import DatabaseListModules from '../database-list-modules/DatabaseListModules' import styles from './styles.module.scss' interface Props { - maxLength: number; - items: any[] + windowDimensions: number; + metrics?: Array; + modules?: Array; } -const DatabaseOverview = ({ maxLength, items }: Props) => ( - - {items.slice(0, maxLength).map((overviewItem) => ( - - { + visible: Array, + hidden: Array +} + +const DatabaseOverview = (props: Props) => { + const { metrics: metricsProps = [], modules: modulesProps = [], windowDimensions } = props + const [metrics, setMetrics] = useState>({ visible: [], hidden: [] }) + const [modules, setModules] = useState>({ visible: [], hidden: [] }) + + useEffect(() => { + const resolutionLimits = getResolutionLimits( + windowDimensions, + metricsProps.filter((item) => item.value !== undefined) + ) + const metricsState: IState = { + visible: [], + hidden: [] + } + metricsProps?.forEach((item) => { + if (item.value !== undefined && item.groupId) { + return + } + if (item.value === undefined || metricsState.visible.length >= resolutionLimits.metrics) { + metricsState.hidden.push(item) + } else { + metricsState.visible.push(item) + } + }) + setMetrics(metricsState) + setModules({ + visible: modulesProps.slice(0, resolutionLimits.modules), + hidden: modulesProps.slice(resolutionLimits.modules) + }) + }, [windowDimensions, metricsProps, modulesProps]) + + const getTooltipContent = (metric: IMetric) => { + if (!metric.children?.length) { + return metric.tooltip.content + } + return metric.children + .filter((item) => item.value !== undefined) + .map((tooltipItem) => ( + - - {overviewItem.icon && ( - - - - )} + {tooltipItem.icon && ( - { overviewItem.content } + - - + )} + + {tooltipItem.content} + + + {tooltipItem.title} + + + )) + } + + return ( + + {metrics.visible?.length > 0 && ( + +
+ + { + metrics.visible.map((overviewItem) => ( + + + + {overviewItem.icon && ( + + + + )} + + {overviewItem.content} + + + + + )) + } + +
+ + )} + +
+ {!!modules.visible?.length && ( + + )} + +
- ))} - -) + + ) +} export default DatabaseOverview diff --git a/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx b/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx new file mode 100644 index 0000000000..1ebdd50a77 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx @@ -0,0 +1,47 @@ +import React, { useContext, useEffect } from 'react' +import { DatabaseOverview } from 'uiSrc/components' +import { useDispatch, useSelector } from 'react-redux' +import { + connectedInstanceOverviewSelector, + connectedInstanceSelector, + getDatabaseConfigInfoAction +} from 'uiSrc/slices/instances' +import { ThemeContext } from 'uiSrc/contexts/themeContext' + +import { getOverviewMetrics } from './components/OverviewMetrics' + +const TIMEOUT_TO_GET_INFO = process.env.NODE_ENV !== 'development' ? 5000 : 100000 + +interface IProps { windowDimensions: number } + +const DatabaseOverviewWrapper = ({ windowDimensions } :IProps) => { + let interval: NodeJS.Timeout + const { theme } = useContext(ThemeContext) + const { id: connectedInstanceId = '', modules = [] } = useSelector(connectedInstanceSelector) + const overview = useSelector(connectedInstanceOverviewSelector) + + const dispatch = useDispatch() + + useEffect(() => { + interval = setInterval(() => { + if (document.hidden) return + + dispatch(getDatabaseConfigInfoAction( + connectedInstanceId, + () => {}, + () => clearInterval(interval) + )) + }, TIMEOUT_TO_GET_INFO) + return () => clearInterval(interval) + }, [connectedInstanceId]) + + return ( + + ) +} + +export default DatabaseOverviewWrapper diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx new file mode 100644 index 0000000000..49e266b797 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx @@ -0,0 +1,120 @@ +import React, { useState } from 'react' +import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLoadingSpinner, EuiPopover } from '@elastic/eui' +import cx from 'classnames' +import parse from 'html-react-parser' + +import { getModule, truncateText } from 'uiSrc/utils' +import { RedisModuleDto } from 'apiSrc/modules/instances/dto/database-instance.dto' + +import { IMetric } from '../OverviewMetrics' + +import './styles.scss' +import styles from './styles.module.scss' + +const ModulesInfoText = 'More information about Redis modules can be found here.\nCreate a free Redis database with modules support on Redis Cloud.\n' + +interface IProps { + metrics: Array, + modules: Array +} + +const MoreInfoPopover = ({ metrics, modules }: IProps) => { + const [isShowMoreInfoPopover, setIsShowMoreInfoPopover] = useState(false) + + return ( + setIsShowMoreInfoPopover(false)} + anchorClassName={styles.moreInfo} + panelClassName={cx('euiToolTip', 'popoverLikeTooltip', 'mi_wrapper')} + button={( + setIsShowMoreInfoPopover((isOpenPopover) => !isOpenPopover)} + aria-labelledby="more info" + /> + )} + > +
+ {!!metrics.length && ( +
+

Database statistics

+ {metrics.map((overviewItem) => ( + + {overviewItem.loading && ( + <> + + ... + + {overviewItem.tooltip.title} + + + )} + {!overviewItem.loading && ( + <> + {overviewItem?.tooltip?.icon && ( + + + + )} + + )} + { + overviewItem.value !== undefined + ? ( + <> + + {overviewItem.tooltip.content} + + + {overviewItem.tooltip.title} + + + ) + : ( + + {overviewItem.unavailableText} + + ) + } + + ))} +
+ )} +
+

Modules

+ { + modules?.map(({ name = '', semanticVersion = '', version = '' }) => ( +
+ {`${truncateText(getModule(name)?.name ?? name, 50)} `} + {!!(semanticVersion || version) && ( + + v. + {' '} + {semanticVersion || version} + + )} +
+ )) + } +

{parse(ModulesInfoText)}

+
+
+ + ) +} + +export default MoreInfoPopover diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/index.ts b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/index.ts new file mode 100644 index 0000000000..bd6daa47ea --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/index.ts @@ -0,0 +1,3 @@ +import MoreInfoPopover from './MoreInfoPopover' + +export default MoreInfoPopover diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.module.scss b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.module.scss new file mode 100644 index 0000000000..c94e71f863 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.module.scss @@ -0,0 +1,72 @@ +.moreInfo { + margin-right: 5px; +} + +.metricsContainer { + width: 220px; + margin-right: 20px; +} +.modulesContainer { + width: 180px; +} + +.moreInfoOverview { + margin-bottom: 14px; +} + +.moreInfoOverviewItem { + margin-bottom: 8px; + + .moreInfoOverviewIcon { + display: flex; + align-items: center; + justify-content: center; + flex-direction: row; + margin-right: 8px; + min-width: 22px; + } + + .moreInfoOverviewContent { + margin-right: 6px; + font-weight: 500; + font-size: 13px; + } + + .moreInfoOverviewTitle { + margin-right: 6px; + font-size: 12px; + font-weight: 200; + } +} + +.mi_fieldName { + font-size: 13px !important; + line-height: 16px; + margin-bottom: 8px; + font-weight: 500; +} + +.mi_smallText { + font: normal normal normal 12px/18px Graphik, sans-serif !important; + color: var(--euiTooltipTextSecondColor) !important; + margin-bottom: 8px; + + a { + color: var(--euiTooltipTextColor) !important; + } +} + +.mi_version { + color: var(--euiTooltipTextSecondColor) !important; +} + +.mi_moduleName { + margin-top: 4px; + line-height: 15px; +} + +.icon { + width: auto !important; + height: 18px !important; + max-width: 22px; +} diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.scss b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.scss new file mode 100644 index 0000000000..10f6ea74b7 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/styles.scss @@ -0,0 +1,3 @@ +.euiPopover__panel.mi_wrapper { + max-width: 432px !important; +} diff --git a/redisinsight/ui/src/components/database-overview/components/OverviewItems.tsx b/redisinsight/ui/src/components/database-overview/components/OverviewItems.tsx deleted file mode 100644 index a08f9558ab..0000000000 --- a/redisinsight/ui/src/components/database-overview/components/OverviewItems.tsx +++ /dev/null @@ -1,155 +0,0 @@ -import React from 'react' -import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLoadingSpinner } from '@elastic/eui' - -import { formatBytes, Nullable, truncateNumberToRange, truncatePercentage } from 'uiSrc/utils' -import { Theme } from 'uiSrc/constants' -import { numberWithSpaces } from 'uiSrc/utils/numbers' -import { - KeyTipIcon, - KeyDarkIcon, - KeyLightIcon, - MemoryDarkIcon, - MemoryLightIcon, - MeasureTipIcon, - MeasureDarkIcon, - MeasureLightIcon, - TimeDarkIcon, - TimeLightIcon, - UserDarkIcon, - UserLightIcon, - UserTipIcon, - InputLightIcon, - InputTipIcon, - OutputLightIcon, - OutputTipIcon, -} from 'uiSrc/components/database-overview/components/icons' - -import styles from 'uiSrc/components/database-overview/styles.module.scss' - -interface Props { - theme: string; - items: { - usedMemory: Nullable; - totalKeys: Nullable; - connectedClients: Nullable; - opsPerSecond: Nullable; - networkInKbps: Nullable; - networkOutKbps: Nullable; - cpuUsagePercentage: Nullable; - }; -} - -export const getOverviewItems = ({ theme, items }: Props) => { - const { - usedMemory, - totalKeys, - connectedClients = 0, - cpuUsagePercentage, - opsPerSecond, - networkInKbps, - networkOutKbps - } = items - - const commandsPerSecTooltip = [ - { - id: 'commands-per-sec-tip', - title: 'Commands/Sec', - icon: theme === Theme.Dark ? MeasureTipIcon : MeasureLightIcon, - value: opsPerSecond - }, - { - id: 'network-input-tip', - title: 'Network Input', - icon: theme === Theme.Dark ? InputTipIcon : InputLightIcon, - value: `${networkInKbps} kbps` - }, - { - id: 'network-output-tip', - title: 'Network Output', - icon: theme === Theme.Dark ? OutputTipIcon : OutputLightIcon, - value: `${networkOutKbps} kbps` - } - ] - - const getConnectedClient = (connectedClients: number = 0) => - (Number.isInteger(connectedClients) ? connectedClients : `~${Math.round(connectedClients)}`) - - return [ - { - id: 'overview-cpu', - tooltip: { - title: 'CPU', - content: cpuUsagePercentage === null ? 'Calculating CPU in progress' : `${truncatePercentage(cpuUsagePercentage, 4)} %` - }, - className: styles.cpuWrapper, - icon: cpuUsagePercentage !== null ? (theme === Theme.Dark ? TimeDarkIcon : TimeLightIcon) : null, - content: cpuUsagePercentage === null ? ( - <> -
- - Calculating... -
- - ) : `${truncatePercentage(cpuUsagePercentage, 2)} %`, - }, - { - id: 'overview-commands-sec', - tooltip: { - content: commandsPerSecTooltip.map((tooltipItem) => ( - - - - - - {tooltipItem.value} - - - {tooltipItem.title} - - - )) - }, - icon: theme === Theme.Dark ? MeasureDarkIcon : MeasureLightIcon, - content: opsPerSecond, - }, - { - id: 'overview-total-memory', - tooltip: { - title: 'Total Memory', - content: formatBytes(usedMemory || 0, 3) - }, - icon: theme === Theme.Dark ? MemoryDarkIcon : MemoryLightIcon, - content: formatBytes(usedMemory || 0, 0), - }, - { - id: 'overview-total-keys', - tooltip: { - title: 'Total Keys', - content: numberWithSpaces(totalKeys || 0) - }, - icon: theme === Theme.Dark ? KeyDarkIcon : KeyLightIcon, - tooltipIcon: theme === Theme.Dark ? KeyTipIcon : KeyLightIcon, - content: truncateNumberToRange(totalKeys || 0), - }, - { - id: 'overview-connected-clients', - tooltip: { - title: 'Connected Clients', - content: getConnectedClient(connectedClients ?? 0) - }, - icon: theme === Theme.Dark ? UserDarkIcon : UserLightIcon, - tooltipIcon: theme === Theme.Dark ? UserTipIcon : UserLightIcon, - content: getConnectedClient(connectedClients ?? 0), - } - ] -} diff --git a/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/OverviewMetrics.tsx b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/OverviewMetrics.tsx new file mode 100644 index 0000000000..72053dff0a --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/OverviewMetrics.tsx @@ -0,0 +1,207 @@ +import React, { ReactNode } from 'react' +import { EuiLoadingSpinner } from '@elastic/eui' + +import { formatBytes, Nullable, truncateNumberToRange, truncatePercentage } from 'uiSrc/utils' +import { Theme } from 'uiSrc/constants' +import { numberWithSpaces } from 'uiSrc/utils/numbers' +import { + KeyDarkIcon, + KeyLightIcon, + MemoryDarkIcon, + MemoryLightIcon, + MeasureDarkIcon, + MeasureLightIcon, + TimeDarkIcon, + TimeLightIcon, + UserDarkIcon, + UserLightIcon, + InputLightIcon, + OutputLightIcon, + InputDarkIcon, + OutputDarkIcon, +} from 'uiSrc/components/database-overview/components/icons' + +import styles from './styles.module.scss' + +interface Props { + theme: string; + items: { + version: string, + usedMemory?: Nullable; + totalKeys?: Nullable; + connectedClients?: Nullable; + opsPerSecond?: Nullable; + networkInKbps?: Nullable; + networkOutKbps?: Nullable; + cpuUsagePercentage?: Nullable; + }; +} + +export interface IMetric { + id: string; + content: ReactNode; + value: any; + unavailableText: string; + title: string; + tooltip: { + title?: string; + icon: Nullable; + content: ReactNode | string; + }; + loading?: boolean; + groupId?: string; + icon?: Nullable; + className?: string; + children?: Array +} + +export const getOverviewMetrics = ({ theme, items }: Props): Array => { + const { + usedMemory, + totalKeys, + connectedClients, + cpuUsagePercentage, + opsPerSecond, + networkInKbps, + networkOutKbps + } = items + + const availableItems: Array = [] + + // CPU + availableItems.push({ + id: 'overview-cpu', + title: 'CPU', + value: cpuUsagePercentage, + loading: cpuUsagePercentage === null, + unavailableText: 'CPU is not available', + tooltip: { + title: 'CPU', + icon: theme === Theme.Dark ? TimeDarkIcon : TimeLightIcon, + content: cpuUsagePercentage === null ? 'Calculating in progress' : `${truncatePercentage(cpuUsagePercentage, 4)} %`, + }, + className: styles.cpuWrapper, + icon: cpuUsagePercentage !== null ? theme === Theme.Dark ? TimeDarkIcon : TimeLightIcon : null, + content: cpuUsagePercentage === null ? ( + <> +
+ + Calculating... +
+ + ) : `${truncatePercentage(cpuUsagePercentage, 2)} %`, + }) + + // Ops per second with tooltip + const opsPerSecItem: any = { + id: 'overview-commands-sec', + icon: theme === Theme.Dark ? MeasureDarkIcon : MeasureLightIcon, + content: opsPerSecond, + value: opsPerSecond, + unavailableText: 'Commands/Sec are not available', + title: 'Commands/Sec', + tooltip: { + icon: theme === Theme.Dark ? MeasureDarkIcon : MeasureLightIcon, + content: opsPerSecond + }, + } + + const networkInKbpsItem = { + id: 'network-input', + groupId: opsPerSecItem.id, + title: 'Network Input', + icon: theme === Theme.Dark ? InputDarkIcon : InputLightIcon, + value: networkInKbps, + content: `${networkInKbps} kbps`, + unavailableText: 'Network Input is not available', + tooltip: { + title: 'Network Input', + icon: theme === Theme.Dark ? InputDarkIcon : InputLightIcon, + content: `${networkInKbps} kbps`, + }, + } + + const networkOutKbpsItem = { + id: 'network-output-tip', + groupId: opsPerSecItem.id, + title: 'Network Output', + icon: theme === Theme.Dark ? OutputDarkIcon : OutputLightIcon, + value: networkOutKbps, + content: `${networkOutKbps} kbps`, + unavailableText: 'Network Output is not available', + tooltip: { + title: 'Network Output', + icon: theme === Theme.Dark ? OutputDarkIcon : OutputLightIcon, + content: `${networkOutKbps} kbps`, + }, + } + + if (opsPerSecond !== undefined && (networkInKbps !== undefined || networkOutKbps !== undefined)) { + opsPerSecItem.children = [ + { + id: 'commands-per-sec-tip', + title: 'Commands/Sec', + icon: theme === Theme.Dark ? MeasureDarkIcon : MeasureLightIcon, + value: opsPerSecond, + content: opsPerSecond, + unavailableText: 'Commands/Sec are not available', + }, + networkInKbpsItem, + networkOutKbpsItem + ] + } + + availableItems.push(opsPerSecItem) + availableItems.push(networkInKbpsItem) + availableItems.push(networkOutKbpsItem) + + // Used memory + availableItems.push({ + id: 'overview-total-memory', + value: usedMemory, + unavailableText: 'Total Memory is not available', + title: 'Total Memory', + tooltip: { + title: 'Total Memory', + icon: theme === Theme.Dark ? MemoryDarkIcon : MemoryLightIcon, + content: formatBytes(usedMemory || 0, 3) + }, + icon: theme === Theme.Dark ? MemoryDarkIcon : MemoryLightIcon, + content: formatBytes(usedMemory || 0, 0), + }) + + // Total keys + availableItems.push({ + id: 'overview-total-keys', + value: totalKeys, + unavailableText: 'Total Keys are not available', + title: 'Total Keys', + tooltip: { + title: 'Total Keys', + content: numberWithSpaces(totalKeys || 0), + icon: theme === Theme.Dark ? KeyDarkIcon : KeyLightIcon, + }, + icon: theme === Theme.Dark ? KeyDarkIcon : KeyLightIcon, + content: truncateNumberToRange(totalKeys || 0), + }) + + const getConnectedClient = (connectedClients: number = 0) => + (Number.isInteger(connectedClients) ? connectedClients : `~${Math.round(connectedClients)}`) + + // Connected clients + availableItems.push({ + id: 'overview-connected-clients', + value: connectedClients, + unavailableText: 'Connected Clients are not available', + title: 'Connected Clients', + tooltip: { + title: 'Connected Clients', + content: getConnectedClient(connectedClients ?? 0), + icon: theme === Theme.Dark ? UserDarkIcon : UserLightIcon, + }, + icon: theme === Theme.Dark ? UserDarkIcon : UserLightIcon, + content: getConnectedClient(connectedClients ?? 0), + }) + + return availableItems +} diff --git a/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/index.ts b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/index.ts new file mode 100644 index 0000000000..1689a31de0 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/index.ts @@ -0,0 +1 @@ +export * from './OverviewMetrics' diff --git a/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/styles.module.scss b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/styles.module.scss new file mode 100644 index 0000000000..5a4538122f --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/components/OverviewMetrics/styles.module.scss @@ -0,0 +1,24 @@ +.calculationWrapper { + display: flex; + align-items: center; + min-width: 134px; +} + +.cpuWrapper { + min-width: 132px; + + @media only screen and (max-width: 1024px) { + min-width: 114px; + } +} + +.calculation { + font-size: 13px; + font-weight: 500; + margin-left: 8px; +} + +.spinner { + width: 18px !important; + height: 18px !important; +} diff --git a/redisinsight/ui/src/components/database-overview/components/icons.ts b/redisinsight/ui/src/components/database-overview/components/icons.ts index 2ee1002833..2f9ca14513 100644 --- a/redisinsight/ui/src/components/database-overview/components/icons.ts +++ b/redisinsight/ui/src/components/database-overview/components/icons.ts @@ -3,6 +3,7 @@ import KeyTipIcon from 'uiSrc/assets/img/overview/key_tip.svg' import KeyLightIcon from 'uiSrc/assets/img/overview/key_light.svg' import MemoryDarkIcon from 'uiSrc/assets/img/overview/memory_dark.svg' import MemoryLightIcon from 'uiSrc/assets/img/overview/memory_light.svg' +import MemoryTipIcon from 'uiSrc/assets/img/overview/memory_tip.svg' import MeasureLightIcon from 'uiSrc/assets/img/overview/measure_light.svg' import MeasureDarkIcon from 'uiSrc/assets/img/overview/measure_dark.svg' import MeasureTipIcon from 'uiSrc/assets/img/overview/measure_tip.svg' @@ -14,8 +15,10 @@ import UserLightIcon from 'uiSrc/assets/img/overview/user_light.svg' import UserTipIcon from 'uiSrc/assets/img/overview/user_tip.svg' import InputTipIcon from 'uiSrc/assets/img/overview/input_tip.svg' import InputLightIcon from 'uiSrc/assets/img/overview/input_light.svg' +import InputDarkIcon from 'uiSrc/assets/img/overview/input_dark.svg' import OutputTipIcon from 'uiSrc/assets/img/overview/output_tip.svg' import OutputLightIcon from 'uiSrc/assets/img/overview/output_light.svg' +import OutputDarkIcon from 'uiSrc/assets/img/overview/output_dark.svg' export { KeyDarkIcon, @@ -23,6 +26,7 @@ export { KeyLightIcon, MemoryDarkIcon, MemoryLightIcon, + MemoryTipIcon, MeasureLightIcon, MeasureDarkIcon, MeasureTipIcon, @@ -34,6 +38,8 @@ export { UserTipIcon, InputTipIcon, InputLightIcon, + InputDarkIcon, OutputTipIcon, - OutputLightIcon + OutputLightIcon, + OutputDarkIcon, } diff --git a/redisinsight/ui/src/components/database-overview/styles.module.scss b/redisinsight/ui/src/components/database-overview/styles.module.scss index 106d1d48be..56023429b5 100644 --- a/redisinsight/ui/src/components/database-overview/styles.module.scss +++ b/redisinsight/ui/src/components/database-overview/styles.module.scss @@ -1,3 +1,40 @@ +.container { + @media only screen and (max-width: 1124px) { + .modules { + margin-left: 0; + border-left: 0; + padding-left: 12px; + padding-right: 8px; + } + + .overview { + border-right: 0; + } + } +} + +.itemContainer { + height: 58px; + background-color: var(--euiColorEmptyShade); + border: 1px solid var(--euiColorLightShade); + align-items: center; + justify-content: center; + margin-left: 6px; +} + +.modules { + padding-left: 22px; + padding-right: 8px; + + @media only screen and (max-width: 767px) { + padding-left: 10px; + } + + &.noModules { + padding-left: 12px; + } +} + .overviewItem { padding: 8px 20px; min-width: 116px; @@ -43,30 +80,7 @@ .moreInfoOverviewTitle { margin-right: 6px; font-size: 12px; + font-weight: 200; } } -.calculationWrapper { - display: flex; - align-items: center; - min-width: 134px; -} - -.cpuWrapper { - min-width: 132px; - - @media only screen and (max-width: 1024px) { - min-width: 114px; - } -} - -.calculation { - font-size: 13px; - font-weight: 500; - margin-left: 8px; -} - -.spinner { - width: 18px !important; - height: 18px !important; -} diff --git a/redisinsight/ui/src/components/database-overview/utils/resolutionHelper.ts b/redisinsight/ui/src/components/database-overview/utils/resolutionHelper.ts new file mode 100644 index 0000000000..1353f27fe2 --- /dev/null +++ b/redisinsight/ui/src/components/database-overview/utils/resolutionHelper.ts @@ -0,0 +1,56 @@ +import { find, min } from 'lodash' +import { IMetric } from 'uiSrc/components/database-overview/components/OverviewMetrics' + +interface ILimits { + width: number; // resolution + metrics: number; // max overview metrics to show + modules: number; // max overview modules to show +} + +const CONFIG = { + maxModules: 6, + overviewMultiFactor: 2, + resolutionLimits: [ + { + width: 1300, + metrics: 5, + modules: 6, + }, + { + width: 1124, + metrics: 5, + modules: 3, + }, + { + width: 920, + metrics: 5, + modules: 0, + }, + { + width: 720, + metrics: 3, + modules: 0, + }, + { + width: -1, + metrics: 2, + modules: 0, + }, + ], +} + +export const getResolutionLimits = (innerWidth: number, metrics: Array): ILimits => { + const limits = find(CONFIG.resolutionLimits, ({ width }) => innerWidth > width) + || CONFIG.resolutionLimits[CONFIG.resolutionLimits.length - 1] + + const spaceNotUsedByOverview = (limits.metrics - metrics.length) * CONFIG.overviewMultiFactor + + if (spaceNotUsedByOverview > 0) { + return { + ...limits, + modules: min([spaceNotUsedByOverview + limits.modules, CONFIG.maxModules]) || 0 + } + } + + return limits +} diff --git a/redisinsight/ui/src/components/index.ts b/redisinsight/ui/src/components/index.ts index d6697c14d0..7721910acb 100644 --- a/redisinsight/ui/src/components/index.ts +++ b/redisinsight/ui/src/components/index.ts @@ -14,6 +14,8 @@ import AdvancedSettings from './advanced-settings/AdvancedSettings' import { ConsentsSettings, ConsentsSettingsPopup } from './consents-settings' import KeyboardShortcut from './keyboard-shortcut/KeyboardShortcut' import ShortcutsFlyout from './shortcuts-flyout/ShortcutsFlyout' +import MonitorConfig from './monitor-config' +import MonitorWrapper from './monitor' export { NavigationMenu, @@ -32,5 +34,7 @@ export { ConsentsSettingsPopup, AdvancedSettings, KeyboardShortcut, - ShortcutsFlyout + MonitorConfig, + MonitorWrapper, + ShortcutsFlyout, } diff --git a/redisinsight/ui/src/components/instance-header/InstanceHeader.tsx b/redisinsight/ui/src/components/instance-header/InstanceHeader.tsx index 22b015779d..9affb771b4 100644 --- a/redisinsight/ui/src/components/instance-header/InstanceHeader.tsx +++ b/redisinsight/ui/src/components/instance-header/InstanceHeader.tsx @@ -1,76 +1,22 @@ -import React, { useContext, useEffect, useState } from 'react' -import { useDispatch, useSelector } from 'react-redux' +import React, { useEffect, useState } from 'react' +import { useSelector } from 'react-redux' +import { useHistory } from 'react-router-dom' import cx from 'classnames' -import parse from 'html-react-parser' -import { capitalize } from 'lodash' -import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiPopover } from '@elastic/eui' +import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui' -import { DatabaseOverview } from 'uiSrc/components' -import { BreadcrumbsLinks, BrowserPageOptions } from 'uiSrc/constants/breadcrumbs' -import { - connectedInstanceOverviewSelector, - connectedInstanceSelector, - getDatabaseConfigInfoAction -} from 'uiSrc/slices/instances' -import { ThemeContext } from 'uiSrc/contexts/themeContext' -import { CONNECTION_TYPE_DISPLAY } from 'uiSrc/slices/interfaces' -import { getDbIndex, getModule, truncateText } from 'uiSrc/utils' -import { getOverviewItems } from 'uiSrc/components/database-overview/components/OverviewItems' - -import DatabaseListModules from '../database-list-modules/DatabaseListModules' -import PageBreadcrumbs from '../page-breadcrumbs' +import { Pages } from 'uiSrc/constants' +import { ConnectionType } from 'uiSrc/slices/interfaces' +import { connectedInstanceOverviewSelector, connectedInstanceSelector } from 'uiSrc/slices/instances' +import ShortInstanceInfo from 'uiSrc/components/instance-header/components/ShortInstanceInfo' +import DatabaseOverviewWrapper from 'uiSrc/components/database-overview/DatabaseOverviewWrapper' import styles from './styles.module.scss' -const maxLengthModules = 6 -const middleLengthModules = 3 -const minLengthModules = 0 - -const maxLengthOverview = 5 -const minLengthOverview = 3 - -const widthResponsiveMaxSize = 1300 -const widthResponsiveMiddleSize = 1124 -const widthResponsiveLowSize = 920 - -const TIMEOUT_TO_GET_INFO = process.env.NODE_ENV !== 'development' ? 5000 : 100000 - -const ModulesInfoText = 'More information about Redis modules can be found here.\nCreate a free Redis database with modules support on Redis Cloud.\n' - const InstanceHeader = () => { - const [lengthModules, setLengthModules] = useState(0) - const [lengthOverviewItems, setLengthOverviewItems] = useState(5) - const [isShowMoreInfoPopover, setIsShowMoreInfoPopover] = useState(false) - - const { - usedMemory, - totalKeys, - connectedClients, - cpuUsagePercentage, - networkInKbps, - networkOutKbps, - opsPerSecond, - version - } = useSelector(connectedInstanceOverviewSelector) - const { id: connectedInstanceId = '' } = useSelector(connectedInstanceSelector) - const { name = '', username = '', connectionType = '', modules = [], db = 0 } = useSelector(connectedInstanceSelector) - - const dispatch = useDispatch() - const { theme } = useContext(ThemeContext) - let interval: NodeJS.Timeout - - const overviewItems = getOverviewItems({ - theme, - items: { - usedMemory, - totalKeys, - connectedClients, - cpuUsagePercentage, - networkInKbps, - networkOutKbps, - opsPerSecond - } - }) + const { name = '', username, connectionType = ConnectionType.Standalone, db = 0 } = useSelector(connectedInstanceSelector) + const { version } = useSelector(connectedInstanceOverviewSelector) + const history = useHistory() + const [windowDimensions, setWindowDimensions] = useState(0) useEffect(() => { updateWindowDimensions() @@ -80,163 +26,57 @@ const InstanceHeader = () => { } }, []) - const getInfo = () => { - if (document.hidden) return - - dispatch(getDatabaseConfigInfoAction( - connectedInstanceId, - () => {}, - () => clearInterval(interval) - )) - } - - useEffect(() => { - interval = setInterval(getInfo, TIMEOUT_TO_GET_INFO) - return () => clearInterval(interval) - }, [connectedInstanceId]) - const updateWindowDimensions = () => { - if (globalThis.innerWidth > widthResponsiveMaxSize) { - setLengthOverviewItems(maxLengthOverview) - setLengthModules(maxLengthModules) - return - } - if (globalThis.innerWidth > widthResponsiveMiddleSize) { - setLengthOverviewItems(maxLengthOverview) - setLengthModules(middleLengthModules) - return - } - if (globalThis.innerWidth > widthResponsiveLowSize) { - setLengthOverviewItems(maxLengthOverview) - setLengthModules(minLengthModules) - return - } - setLengthOverviewItems(minLengthOverview) - setLengthModules(minLengthModules) - } - - const getBreadcrumbsInstanceOptions = (): BrowserPageOptions => ({ - connectedInstanceName: name, - postfix: getDbIndex(db), - connection: connectionType ? CONNECTION_TYPE_DISPLAY[connectionType] : capitalize(connectionType), - version, - user: username || 'Default' - }) - - const getContentOverview = (items: any[], truncateLength = 0) => { - const moreInfoItems = items.slice(truncateLength) - .map((overviewItem) => ( - - {overviewItem.tooltipIcon && ( - - - - )} - - { overviewItem.tooltip.content } - - - { overviewItem.tooltip.title } - - - )) - - return ( -
0 })}> - { moreInfoItems } -
- ) + setWindowDimensions(globalThis.innerWidth) } - const getContentModules = () => { - const modulesNames = modules?.slice(lengthModules).map(({ name = '', semanticVersion = '', version = '' }) => ( -
- {`${truncateText(getModule(name)?.name ?? name, 50)} `} - {!!(semanticVersion || version) && ( - - v. - {' '} - {semanticVersion || version} - - )} -
- )) - - return ( - <> -

Modules:

-

{parse(ModulesInfoText)}

- {modulesNames ?? null} - - ) + const goHome = () => { + history.push(Pages.home) } - const MoreInfo = () => ( - setIsShowMoreInfoPopover(false)} - anchorClassName={styles.moreInfo} - panelClassName={cx('euiToolTip', 'popoverLikeTooltip', styles.mi_wrapper)} - button={( - setIsShowMoreInfoPopover((isOpenPopover) => !isOpenPopover)} - aria-labelledby="more info" - /> - )} - > - <> - {getContentOverview(overviewItems, lengthOverviewItems)} - {getContentModules()} - - - ) - return (
- +
+ + + +
+
+ + )} + > + {db > 0 ? `${name} [${db}]` : name} + +
- - -
- -
- - -
- {!!modules?.length && ( - - )} - {MoreInfo()} -
- - + diff --git a/redisinsight/ui/src/components/instance-header/components/ShortInstanceInfo.tsx b/redisinsight/ui/src/components/instance-header/components/ShortInstanceInfo.tsx new file mode 100644 index 0000000000..05e9dd4394 --- /dev/null +++ b/redisinsight/ui/src/components/instance-header/components/ShortInstanceInfo.tsx @@ -0,0 +1,46 @@ +import React from 'react' +import { capitalize } from 'lodash' + +import { CONNECTION_TYPE_DISPLAY, ConnectionType } from 'uiSrc/slices/interfaces' +import { Nullable } from 'uiSrc/utils' + +import styles from './styles.module.scss' + +interface IProps { + name: string; + connectionType: ConnectionType; + version: string; + dbIndex: number; + user?: Nullable; +} +const ShortInstanceInfo = (props: IProps) => { + const { name, connectionType, version, user, dbIndex } = props + return (( +
+
+ Database Name + : + {dbIndex > 0 ? `${name} [${dbIndex}]` : name } +
+
+ Connection + : + + {connectionType ? CONNECTION_TYPE_DISPLAY[connectionType] : capitalize(connectionType)} + +
+
+ Version + : + {version} +
+
+ Username + : + {user || 'Default'} +
+
+ )) +} + +export default ShortInstanceInfo diff --git a/redisinsight/ui/src/components/instance-header/components/styles.module.scss b/redisinsight/ui/src/components/instance-header/components/styles.module.scss new file mode 100644 index 0000000000..f53624535c --- /dev/null +++ b/redisinsight/ui/src/components/instance-header/components/styles.module.scss @@ -0,0 +1,8 @@ +.tooltipItem { + margin-bottom: 4px; +} + +.tooltipItemValue { + margin-left: 4px; + font-weight: 300; +} diff --git a/redisinsight/ui/src/components/instance-header/styles.module.scss b/redisinsight/ui/src/components/instance-header/styles.module.scss index 087886aaab..de0c057088 100644 --- a/redisinsight/ui/src/components/instance-header/styles.module.scss +++ b/redisinsight/ui/src/components/instance-header/styles.module.scss @@ -1,104 +1,38 @@ .container { padding: 6px 16px 6px; height: 70px; - - @media only screen and (max-width: 1124px) { - .modules { - margin-left: 0; - border-left: 0; - padding-left: 12px; - padding-right: 8px; - } - - .overview { - border-right: 0; - } - } -} - -.moreInfo { - margin-right: 5px; -} - -.moreInfoOverview { - margin-bottom: 14px; -} - -.moreInfoOverviewItem { - margin-bottom: 8px; - - .moreInfoOverviewIcon { - margin-right: 8px; - } - - .moreInfoOverviewContent { - margin-right: 6px; - font-weight: 500; - font-size: 13px; - } - - .moreInfoOverviewTitle { - margin-right: 6px; - font-size: 12px; - } -} - -.mi_wrapper { - width: 220px !important; - white-space: pre-wrap; -} - -.mi_fieldName { - font-size: 13px !important; - line-height: 16px; - padding-bottom: 4px; - font-weight: 500; -} - -.mi_smallText { - font: normal normal normal 12px/18px Graphik, sans-serif !important; - color: var(--euiTooltipTextSecondColor) !important; - margin-bottom: 8px; - - a { - color: var(--euiTooltipTextColor) !important; - } -} - -.mi_version { - color: var(--euiTooltipTextSecondColor) !important; -} - -.mi_moduleName { - padding-top: 4px; - line-height: 15px; } .breadcrumbsContainer { - height: 58px; + height: 100%; + display: flex; + align-items: center; background-color: var(--euiColorEmptyShade); border: 1px solid var(--euiColorLightShade); padding: 0 12px; -} -.itemContainer { - height: 58px; - background-color: var(--euiColorEmptyShade); - border: 1px solid var(--euiColorLightShade); - align-items: center; - justify-content: center; - margin-left: 6px; + & > div { + display: flex; + &:not(:last-of-type) { + margin-right: 12px; + } + } } -.modules { - padding-left: 22px; - padding-right: 8px; +.tooltip { + max-width: 372px !important; +} - @media only screen and (max-width: 767px) { - padding-left: 10px; - } +.tooltipAnchor { + max-width: 100%; +} - &.noModules { - padding-left: 12px; - } +.dbName { + display: inline-block !important; + overflow: hidden; + font-size: 13px; + text-overflow: ellipsis; + max-width: 100%; + white-space: nowrap; } + diff --git a/redisinsight/ui/src/components/monitor-config/MonitorConfig.spec.tsx b/redisinsight/ui/src/components/monitor-config/MonitorConfig.spec.tsx new file mode 100644 index 0000000000..3e7ca4d8fc --- /dev/null +++ b/redisinsight/ui/src/components/monitor-config/MonitorConfig.spec.tsx @@ -0,0 +1,148 @@ +/* eslint-disable sonarjs/no-duplicate-string */ +import { cloneDeep } from 'lodash' +import React from 'react' +import MockedSocket from 'socket.io-mock' +import socketIO from 'socket.io-client' +import { monitorSelector, setSocket, stopMonitor, toggleRunMonitor } from 'uiSrc/slices/cli/monitor' +import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils' +import { MonitorEvent, SocketEvent } from 'uiSrc/constants' +import MonitorConfig from './MonitorConfig' + +let store: typeof mockedStore +let socket: typeof MockedSocket +beforeEach(() => { + cleanup() + socket = new MockedSocket() + socketIO.mockReturnValue(socket) + store = cloneDeep(mockedStore) + store.clearActions() +}) + +jest.mock('socket.io-client') + +jest.mock('uiSrc/slices/cli/monitor', () => ({ + ...jest.requireActual('uiSrc/slices/cli/monitor'), + monitorSelector: jest.fn().mockReturnValue({ + isRunning: false, + isMinimizedMonitor: false, + isShowMonitor: true, + }), +})) + +jest.mock('uiSrc/slices/instances', () => ({ + ...jest.requireActual('uiSrc/slices/instances'), + connectedInstanceSelector: jest.fn().mockReturnValue({ + id: '1' + }), +})) + +describe('MonitorConfig', () => { + it('should render', () => { + expect(render()).toBeTruthy() + }) + + it('socket should be set to store', () => { + render() + + const monitorSelectorMock = jest.fn().mockReturnValue({ + isRunning: true, + }) + monitorSelector.mockImplementation(monitorSelectorMock) + + const { unmount } = render() + const afterRenderActions = [ + setSocket(socket), + ] + expect(store.getActions()).toEqual([...afterRenderActions]) + + unmount() + }) + + it(`should emit ${MonitorEvent.Monitor} event`, () => { + const monitorSelectorMock = jest.fn().mockReturnValue({ + isRunning: true, + }) + monitorSelector.mockImplementation(monitorSelectorMock) + + const { unmount } = render() + + socket.on(MonitorEvent.MonitorData, (data) => { + expect(data).toEqual(['message1', 'message2']) + }) + + socket.socketClient.emit(MonitorEvent.MonitorData, ['message1', 'message2']) + + const afterRenderActions = [ + setSocket(socket), + ] + expect(store.getActions()).toEqual([...afterRenderActions]) + + unmount() + }) + + it('monitor should catch Exception', () => { + const { unmount } = render() + + const monitorSelectorMock = jest.fn().mockReturnValue({ + isRunning: true, + }) + monitorSelector.mockImplementation(monitorSelectorMock) + + socket.on(MonitorEvent.Exception, (error) => { + expect(error).toEqual({ message: 'test', name: 'error' }) + // done() + }) + + socket.socketClient.emit(MonitorEvent.Exception, { message: 'test', name: 'error' }) + + const afterRenderActions = [ + setSocket(socket), + toggleRunMonitor() + ] + expect(store.getActions()).toEqual([...afterRenderActions]) + + unmount() + }) + + it('monitor should catch connect_error', () => { + const { unmount } = render() + + const monitorSelectorMock = jest.fn().mockReturnValue({ + isRunning: true, + }) + monitorSelector.mockImplementation(monitorSelectorMock) + + socket.on(SocketEvent.ConnectionError, (error) => { + expect(error).toEqual({ message: 'test', name: 'error' }) + }) + + socket.socketClient.emit(SocketEvent.ConnectionError, { message: 'test', name: 'error' }) + + const afterRenderActions = [ + setSocket(socket), + toggleRunMonitor() + ] + expect(store.getActions()).toEqual([...afterRenderActions]) + + unmount() + }) + + it('monitor should catch disconnect', () => { + const { unmount } = render() + + const monitorSelectorMock = jest.fn().mockReturnValue({ + isRunning: true, + }) + monitorSelector.mockImplementation(monitorSelectorMock) + + socket.socketClient.emit(SocketEvent.Disconnect) + + const afterRenderActions = [ + setSocket(socket), + stopMonitor() + ] + expect(store.getActions()).toEqual([...afterRenderActions]) + + unmount() + }) +}) diff --git a/redisinsight/ui/src/components/monitor-config/MonitorConfig.tsx b/redisinsight/ui/src/components/monitor-config/MonitorConfig.tsx new file mode 100644 index 0000000000..5f3b0b61d7 --- /dev/null +++ b/redisinsight/ui/src/components/monitor-config/MonitorConfig.tsx @@ -0,0 +1,115 @@ +import { useEffect } from 'react' +import { useDispatch, useSelector } from 'react-redux' +import { debounce } from 'lodash' +import { io } from 'socket.io-client' + +import { + setSocket, + monitorSelector, + toggleRunMonitor, + concatMonitorItems, + stopMonitor, +} from 'uiSrc/slices/cli/monitor' +import { getBaseApiUrl } from 'uiSrc/utils' +import { MonitorEvent, SocketErrors, SocketEvent } from 'uiSrc/constants' +import { IMonitorDataPayload } from 'uiSrc/slices/interfaces' +import { connectedInstanceSelector } from 'uiSrc/slices/instances' +import { IOnDatePayload } from 'apiSrc/modules/monitor/helpers/client-monitor-observer' + +interface IProps { + retryDelay?: number; +} +const MonitorConfig = ({ retryDelay = 10000 } : IProps) => { + const { id: instanceId = '' } = useSelector(connectedInstanceSelector) + const { socket, isRunning, isMinimizedMonitor, isShowMonitor } = useSelector(monitorSelector) + + const dispatch = useDispatch() + + const setNewItems = debounce((items, onSuccess?) => { + dispatch(concatMonitorItems(items)) + onSuccess?.() + }, 50, { + maxWait: 150, + }) + + const getErrorMessage = (error: { type: string; name: any; message: any }): string => { + if (error?.type === SocketErrors.TransportError) { + return 'Error: Connection was lost' + } + return error?.name || error?.message + } + + useEffect(() => { + if (!isRunning || !instanceId || socket?.connected) { + return + } + let retryTimer: NodeJS.Timer + + // Create SocketIO connection to instance by instanceId + const newSocket = io(`${getBaseApiUrl()}/monitor`, { + forceNew: true, + query: { instanceId }, + rejectUnauthorized: false, + }) + dispatch(setSocket(newSocket)) + let payloads: IMonitorDataPayload[] = [] + + const handleMonitorEvents = () => { + newSocket.on(MonitorEvent.MonitorData, (payload:IOnDatePayload[]) => { + payloads = payloads.concat(payload) + + // set batch of payloads and then clear batch + setNewItems(payloads, () => { + payloads.length = 0 + // reset all timings after items were changed + setNewItems.cancel() + }) + }) + } + + const handleDisconnect = () => { + newSocket.removeAllListeners() + dispatch(stopMonitor()) + } + + newSocket.on(SocketEvent.Connect, () => { + // Trigger Monitor event + clearTimeout(retryTimer) + newSocket.emit(MonitorEvent.Monitor, handleMonitorEvents) + }) + + // Catch exceptions + newSocket.on(MonitorEvent.Exception, (payload) => { + payloads.push({ isError: true, time: `${Date.now()}`, ...payload }) + setNewItems(payloads, () => { payloads.length = 0 }) + dispatch(toggleRunMonitor()) + }) + + // Catch disconnect + newSocket.on(SocketEvent.Disconnect, () => { + if (retryDelay) { + retryTimer = setTimeout(handleDisconnect, retryDelay) + } else { + handleDisconnect() + } + }) + + // Catch connect error + newSocket.on(SocketEvent.ConnectionError, (error) => { + payloads.push({ isError: true, time: `${Date.now()}`, message: getErrorMessage(error) }) + setNewItems(payloads, () => { payloads.length = 0 }) + dispatch(toggleRunMonitor()) + }) + }, [instanceId, isRunning]) + + useEffect(() => { + if (!isRunning) { + socket?.removeAllListeners() + socket?.disconnect() + } + }, [socket, isRunning, isShowMonitor, isMinimizedMonitor]) + + return null +} + +export default MonitorConfig diff --git a/redisinsight/ui/src/components/monitor-config/index.ts b/redisinsight/ui/src/components/monitor-config/index.ts new file mode 100644 index 0000000000..4dfbb8362c --- /dev/null +++ b/redisinsight/ui/src/components/monitor-config/index.ts @@ -0,0 +1,3 @@ +import MonitorConfig from './MonitorConfig' + +export default MonitorConfig diff --git a/redisinsight/ui/src/components/monitor/Monitor/Monitor.spec.tsx b/redisinsight/ui/src/components/monitor/Monitor/Monitor.spec.tsx new file mode 100644 index 0000000000..a122e1ddb2 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/Monitor/Monitor.spec.tsx @@ -0,0 +1,65 @@ +import { cloneDeep } from 'lodash' +import React from 'react' +import { instance, mock } from 'ts-mockito' +import { cleanup, fireEvent, mockedStore, render, screen } from 'uiSrc/utils/test-utils' +import Monitor, { Props } from './Monitor' + +const mockedProps = mock() +let store: typeof mockedStore + +beforeEach(() => { + cleanup() + store = cloneDeep(mockedStore) + store.clearActions() +}) + +describe('Monitor', () => { + it('should render', () => { + expect(render()).toBeTruthy() + }) + + it('Monitor should be in the Document', () => { + render() + + const monitor = screen.queryByTestId('monitor') + + expect(monitor).toBeInTheDocument() + }) + + it('Default text component should be in the Document by default', () => { + render() + + const monitorDefault = screen.queryByTestId('monitor-not-started') + + expect(monitorDefault).toBeInTheDocument() + }) + + it('Default text component should not be in the Document when some items exists', () => { + const items = [{ + time: '1', + args: ['test'], + source: '1', + database: 0, + shardOptions: { host: '127.0.0.1', port: 6379 } + }] + const { queryByTestId, unmount } = render( + + ) + + const monitorDefault = queryByTestId('monitor-not-started') + + expect(monitorDefault).not.toBeInTheDocument() + unmount() + }) + + it('Monitor should start after click on the play button', () => { + const handleRunMonitorMock = jest.fn() + render( + + ) + + fireEvent.click(screen.getByTestId('start-monitor') ?? {}) + + expect(handleRunMonitorMock).toBeCalled() + }) +}) diff --git a/redisinsight/ui/src/components/monitor/Monitor/Monitor.tsx b/redisinsight/ui/src/components/monitor/Monitor/Monitor.tsx new file mode 100644 index 0000000000..21314bf467 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/Monitor/Monitor.tsx @@ -0,0 +1,108 @@ +import React from 'react' +import { + EuiButtonIcon, + EuiFlexGroup, + EuiFlexItem, + EuiIcon, + EuiTextColor, + EuiToolTip, +} from '@elastic/eui' +import { AutoSizer } from 'react-virtualized' + +import { IMonitorDataPayload } from 'uiSrc/slices/interfaces' +import MonitorOutputList from '../MonitorOutputList' + +import styles from './styles.module.scss' + +export interface Props { + items: IMonitorDataPayload[] + isStarted: boolean + isRunning: boolean + isShowHelper: boolean + isShowCli: boolean + scrollViewOnAppear: boolean + handleRunMonitor: () => void +} + +const Monitor = (props: Props) => { + const { + items = [], + isRunning = false, + isStarted = false, + isShowHelper = false, + isShowCli = false, + handleRunMonitor = () => {} + } = props + + const MonitorNotStarted = () => ( +
+
+ + + +
Start Profiler
+ + + + + + + Running Profiler will decrease throughput, avoid running it in production databases + + + +
+
+ ) + + const isMonitorStopped = !!items?.length && !isRunning + + return ( + <> +
+ {(!isStarted || (!isRunning && !items?.length)) && } + {!items?.length && isRunning &&
Profiler is started.
} + + {isStarted && !!items?.length && ( +
+ + {({ width, height }) => ( + <> + + {isMonitorStopped && ( +
+ Profiler is stopped. +
+ )} + + )} + +
+ )} +
+ + ) +} + +export default React.memo(Monitor) diff --git a/redisinsight/ui/src/components/monitor/Monitor/index.ts b/redisinsight/ui/src/components/monitor/Monitor/index.ts new file mode 100644 index 0000000000..ada7e68e5b --- /dev/null +++ b/redisinsight/ui/src/components/monitor/Monitor/index.ts @@ -0,0 +1,3 @@ +import Monitor from './Monitor' + +export default Monitor diff --git a/redisinsight/ui/src/components/monitor/Monitor/styles.module.scss b/redisinsight/ui/src/components/monitor/Monitor/styles.module.scss new file mode 100644 index 0000000000..dff8d41a24 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/Monitor/styles.module.scss @@ -0,0 +1,175 @@ +@import '@elastic/eui/src/global_styling/mixins/helpers'; +@import '@elastic/eui/src/components/table/mixins'; +@import '@elastic/eui/src/global_styling/index'; + +.container { + @include euiScrollBar; + height: calc(100% - 34px); + position: relative; + width: 100%; + padding-left: 12px; + + background-color: var(--browserTableRowEven); + text-align: left; + letter-spacing: 0; + white-space: pre-line; + color: var(--euiTextSubduedColor) !important; + border-top: 1px solid var(--euiColorLightShade); + + font: normal normal normal 14px/17px Inconsolata; + + z-index: 10; + overflow: auto; + + :global { + .euiFlexGroup, .euiFlexItem { + margin: 0px !important; + } + } +} + +.listWrapper { + @include euiScrollBar; + + width: 100%; + height: 100%; + position: relative; + overflow: auto; +} + +.content { + @include euiScrollBar; + + width: 100%; + height: 100%; + position: relative; + overflow: auto; + + &:first-child { + padding-top: 10px; + } + + &:last-child { + padding-bottom: 10px; + } +} + +.startContainer { + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + + height: 100%; +} + +.startContent { + display: flex; + align-items: center; + max-width: 264px; + flex-direction: column; + align-items: center; + + font: normal normal normal 12px/18px Graphik, sans-serif; +} + +.autoScrollContainer { + :global { + .react-auto-scroll__scroll-container { + @include euiScrollBar; + } + + .react-auto-scroll__option { + // display: none; + } + } +} + +.table { + table { + background-color: initial !important; + } + + thead { + display: none; + } + + :global { + .euiTableCellContent { + padding: 0; + } + .euiTableRow { + td:first-child, + td:last-child { + border: none + } + + &:hover { + background-color: inherit !important; + } + } + + .euiTableRowCell { + border: none; + } + } +} + +.startTitle { + font-size: 13px; + letter-spacing: -0.13px; + padding: 4px 0 18px; +} + +.startTitleIcon svg { + width: 26px; + height: 26px; +} + +.itemCommand { + padding-right: 6px; +} + +.itemCommandFirst { + color: #569cd6; +} + +.itemArgs { + word-break: break-word; + padding-right: 10px; + color: var(--euiTextSubduedColorHover); +} + +.itemArgs__compressed { + max-width: 330px; + width: max-content; + color: var(--euiTextSubduedColorHover); +} + +.item { + display: block; + overflow: hidden; + + & > span { + padding-right: 5px; + } +} + +.itemTime { + width: 94px; + padding-right: 10px; +} + +.monitorWrapper { + height: 100%; + white-space: pre-line; + border-top: 1px solid var(--euiColorLightShade); + border-left: 1px solid var(--euiColorLightShade); + border-right: 1px solid var(--euiColorLightShade); +} + + +.scrollDivRef { + padding-top: 10px; + margin-left: -12px; +} diff --git a/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.spec.tsx b/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.spec.tsx new file mode 100644 index 0000000000..46b49cb14c --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.spec.tsx @@ -0,0 +1,57 @@ +import React from 'react' +import { cloneDeep } from 'lodash' +import { + cleanup, + fireEvent, mockedStore, + render, + screen, +} from 'uiSrc/utils/test-utils' +import { resetMonitorItems, setMonitorInitialState, toggleHideMonitor, toggleMonitor, toggleRunMonitor } from 'uiSrc/slices/cli/monitor' +import MonitorHeader from './MonitorHeader' + +let store: typeof mockedStore +beforeEach(() => { + cleanup() + store = cloneDeep(mockedStore) + store.clearActions() +}) + +describe('MonitorHeader', () => { + it('should render', () => { + expect(render()).toBeTruthy() + }) + + it('should "setMonitorInitialState" action be called after click "close-monitor" button', () => { + render() + fireEvent.click(screen.getByTestId('close-monitor')) + + const expectedActions = [setMonitorInitialState()] + expect(store.getActions()).toEqual(expectedActions) + }) + + it('should "toggleCliHelper" action be called after click "hide-monitor" button', () => { + render() + fireEvent.click(screen.getByTestId('hide-monitor')) + + const expectedActions = [toggleMonitor(), toggleHideMonitor()] + expect(store.getActions()).toEqual(expectedActions) + }) + + it('Should toggle run Monitor after click on the play button', () => { + render() + + fireEvent.click(screen.getByTestId('toggle-run-monitor')) + + const expectedActions = [toggleRunMonitor()] + expect(store.getActions()).toEqual(expectedActions) + }) + + it('Should clear Monitor items after click on the clear button', () => { + render() + + fireEvent.click(screen.getByTestId('clear-monitor')) + + const expectedActions = [resetMonitorItems()] + expect(store.getActions()).toEqual(expectedActions) + }) +}) diff --git a/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.tsx b/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.tsx new file mode 100644 index 0000000000..8accc5a123 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorHeader/MonitorHeader.tsx @@ -0,0 +1,124 @@ +import React from 'react' +import { useDispatch, useSelector } from 'react-redux' +import cx from 'classnames' +import { + EuiFlexGroup, + EuiFlexItem, + EuiButtonIcon, + EuiText, + EuiToolTip, + EuiIcon, +} from '@elastic/eui' + +import { + monitorSelector, + resetMonitorItems, + setMonitorInitialState, + toggleHideMonitor, + toggleMonitor, + toggleRunMonitor +} from 'uiSrc/slices/cli/monitor' +import styles from './styles.module.scss' + +const MonitorHeader = () => { + const { isRunning, isStarted, items } = useSelector(monitorSelector) + + const dispatch = useDispatch() + + const handleCloseMonitor = () => { + dispatch(setMonitorInitialState()) + } + + const handleHideMonitor = () => { + dispatch(toggleMonitor()) + dispatch(toggleHideMonitor()) + } + + const handleRunMonitor = () => { + dispatch(toggleRunMonitor()) + } + + const handleClearMonitor = () => { + dispatch(resetMonitorItems()) + } + + return ( +
+ + + + Profiler + + + + + + + + + + + + + + + + + + + + + +
+ ) +} + +export default MonitorHeader diff --git a/redisinsight/ui/src/components/monitor/MonitorHeader/index.ts b/redisinsight/ui/src/components/monitor/MonitorHeader/index.ts new file mode 100644 index 0000000000..666f384a33 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorHeader/index.ts @@ -0,0 +1,3 @@ +import MonitorHeader from './MonitorHeader' + +export default MonitorHeader diff --git a/redisinsight/ui/src/components/monitor/MonitorHeader/styles.module.scss b/redisinsight/ui/src/components/monitor/MonitorHeader/styles.module.scss new file mode 100644 index 0000000000..d3f561549e --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorHeader/styles.module.scss @@ -0,0 +1,42 @@ +.container { + height: 34px; + line-height: 34px; + width: 100%; + overflow: hidden; + background-color: var(--euiPageBackgroundColor); + + padding: 0 10px 0 16px; + z-index: 10; + + .actions { + width: 82px; + height: 100%; + flex-direction: row; + align-items: center; + justify-content: space-evenly; + margin-left: 12px; + + border-left: 1px solid var(--euiColorLightShade); + border-right: 1px solid var(--euiColorLightShade); + } + + :global(.transparent button) { + cursor: default; + } +} + +.icon { + margin-left: 5px; +} + +.title { + display: flex; + flex-direction: row !important; + align-items: center; + :global { + .euiIcon { + color: var(--euiColorPrimary); + margin-right: 8px; + } + } +} diff --git a/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.spec.tsx b/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.spec.tsx new file mode 100644 index 0000000000..31437b20d1 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.spec.tsx @@ -0,0 +1,24 @@ +import React from 'react' +import { mock } from 'ts-mockito' +import { render } from 'uiSrc/utils/test-utils' + +import MonitorOutputList, { Props } from './MonitorOutputList' + +const mockedProps = { + ...mock(), + height: 20, + width: 20 +} + +describe('MonitorOutputList', () => { + it('should render', () => { + expect(render()).toBeTruthy() + }) + + it('should "ReactVirtualized__Grid" be in the DOM', () => { + const item = { time: '112', args: ['ttl'], source: '12', database: '0' } + const mockItems = [item] + const { container } = render() + expect(container.getElementsByClassName('ReactVirtualized__Grid').length).toBe(1) + }) +}) diff --git a/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.tsx b/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.tsx new file mode 100644 index 0000000000..f3ca46578a --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.tsx @@ -0,0 +1,99 @@ +import React, { useEffect, useRef } from 'react' +import cx from 'classnames' +import { EuiTextColor } from '@elastic/eui' +import { CellMeasurer, List, CellMeasurerCache, ListRowProps } from 'react-virtualized' + +import { getFormatTime } from 'uiSrc/utils' +import { DEFAULT_TEXT } from 'uiSrc/components/notifications' + +import styles from 'uiSrc/components/monitor/Monitor/styles.module.scss' +import 'react-virtualized/styles.css' + +export interface Props { + compressed: boolean + items: any[] + width: number + height: number +} + +const PROTRUDING_OFFSET = 2 + +const MonitorOutputList = (props: Props) => { + const { compressed, items = [], width = 0, height = 0 } = props + + const cache = new CellMeasurerCache({ + defaultHeight: 17, + fixedWidth: true, + fixedHeight: false + }) + + const listRef = useRef(null) + + const clearCacheAndUpdate = () => { + listRef?.current?.scrollToRow(items.length - 1) + requestAnimationFrame(() => { + listRef?.current?.scrollToRow(items.length - 1) + }) + } + + useEffect(() => { + clearCacheAndUpdate() + }, [items]) + + const getArgs = (args: string[]): JSX.Element => ( + + {args?.map((arg, i) => ( + + {i === 0 && ( + {`"${arg}"`} + )} + { i !== 0 && ` "${arg}"`} + + ))} + + ) + + const rowRenderer = ({ parent, index, key, style }: ListRowProps) => { + const { time = '', args = [], database = '', source = '', isError, message = '' } = items[index] + return ( + + {({ registerChild, measure }) => ( +
+ {!isError && ( + <> + {getFormatTime(time)} + {`[${database} ${source}]`} + {getArgs(args)} + + )} + {isError && ( + {message ?? DEFAULT_TEXT} + )} +
+ )} + + ) + } + + return ( + + ) +} + +export default MonitorOutputList diff --git a/redisinsight/ui/src/components/monitor/MonitorOutputList/index.ts b/redisinsight/ui/src/components/monitor/MonitorOutputList/index.ts new file mode 100644 index 0000000000..ab31ce992d --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorOutputList/index.ts @@ -0,0 +1,3 @@ +import MonitorOutputList from './MonitorOutputList' + +export default MonitorOutputList diff --git a/redisinsight/ui/src/components/monitor/MonitorWrapper.spec.tsx b/redisinsight/ui/src/components/monitor/MonitorWrapper.spec.tsx new file mode 100644 index 0000000000..c12006e92c --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorWrapper.spec.tsx @@ -0,0 +1,42 @@ +import { cloneDeep } from 'lodash' +import React from 'react' +import { cleanup, mockedStore, render, screen } from 'uiSrc/utils/test-utils' +import MonitorWrapper from './MonitorWrapper' + +let store: typeof mockedStore + +beforeEach(() => { + cleanup() + store = cloneDeep(mockedStore) + store.clearActions() +}) + +describe('MonitorWrapper', () => { + it('should render', () => { + expect(render()).toBeTruthy() + }) + + it('MonitorWrapper should be in the Document', () => { + render() + + const monitorWrapper = screen.queryByTestId('monitor-container') + + expect(monitorWrapper).toBeInTheDocument() + }) + + it('MonitorWrapper should be in the Document', () => { + render() + + const monitor = screen.queryByTestId('monitor') + + expect(monitor).toBeInTheDocument() + }) + + it('MonitorHeader should be in the Document', () => { + render() + + const monitorHeader = screen.queryByTestId('monitor-header') + + expect(monitorHeader).toBeInTheDocument() + }) +}) diff --git a/redisinsight/ui/src/components/monitor/MonitorWrapper.tsx b/redisinsight/ui/src/components/monitor/MonitorWrapper.tsx new file mode 100644 index 0000000000..72cc6a0c64 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/MonitorWrapper.tsx @@ -0,0 +1,38 @@ +import React from 'react' +import { useDispatch, useSelector } from 'react-redux' + +import { monitorSelector, toggleRunMonitor } from 'uiSrc/slices/cli/monitor' +import { cliSettingsSelector } from 'uiSrc/slices/cli/cli-settings' +import Monitor from './Monitor' +import MonitorHeader from './MonitorHeader' + +import styles from './Monitor/styles.module.scss' + +const MonitorWrapper = () => { + const { items, isStarted, isRunning } = useSelector(monitorSelector) + const { isShowCli, isShowHelper, } = useSelector(cliSettingsSelector) + + const dispatch = useDispatch() + + const onRunMonitor = () => { + dispatch(toggleRunMonitor()) + } + + return ( +
+ + +
+ + ) +} + +export default React.memo(MonitorWrapper) diff --git a/redisinsight/ui/src/components/monitor/index.ts b/redisinsight/ui/src/components/monitor/index.ts new file mode 100644 index 0000000000..44e4977ae7 --- /dev/null +++ b/redisinsight/ui/src/components/monitor/index.ts @@ -0,0 +1,3 @@ +import MonitorWrapper from './MonitorWrapper' + +export default MonitorWrapper diff --git a/redisinsight/ui/src/components/notifications/Notifications.tsx b/redisinsight/ui/src/components/notifications/Notifications.tsx index 9cc3070117..8ecd1e59ff 100644 --- a/redisinsight/ui/src/components/notifications/Notifications.tsx +++ b/redisinsight/ui/src/components/notifications/Notifications.tsx @@ -22,7 +22,7 @@ import errorMessages from './error-messages' import styles from './styles.module.scss' -const DEFAULT_TEXT = 'Something went wrong.' +export const DEFAULT_TEXT = 'Something went wrong.' const Notifications = () => { const messagesData = useSelector(messagesSelector) diff --git a/redisinsight/ui/src/components/notifications/index.ts b/redisinsight/ui/src/components/notifications/index.ts new file mode 100644 index 0000000000..c242b9537b --- /dev/null +++ b/redisinsight/ui/src/components/notifications/index.ts @@ -0,0 +1 @@ +export * from './Notifications' diff --git a/redisinsight/ui/src/components/query-card/QueryCard.spec.tsx b/redisinsight/ui/src/components/query-card/QueryCard.spec.tsx index c2b4fc04f8..cdb2c2832f 100644 --- a/redisinsight/ui/src/components/query-card/QueryCard.spec.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCard.spec.tsx @@ -1,7 +1,8 @@ import { cloneDeep } from 'lodash' import React from 'react' import { instance, mock } from 'ts-mockito' -import { cleanup, fireEvent, mockedStore, render } from 'uiSrc/utils/test-utils' +import { toggleOpenWBResult } from 'uiSrc/slices/workbench/wb-results' +import { cleanup, clearStoreActions, fireEvent, mockedStore, render } from 'uiSrc/utils/test-utils' import QueryCard, { Props } from './QueryCard' const mockedProps = mock() @@ -42,25 +43,66 @@ describe('QueryCard', () => { expect(cliResultEl).not.toBeInTheDocument() }) - it.only('Cli result should in the document after Expand', () => { - const cardHeaderTestId = 'query-card-open' + it('Cli result should in the document when "isOpen = true"', () => { const cliResultTestId = 'query-cli-result' + const mockResult = [{ + response: 'response', + status: 'success' + }] + const { queryByTestId } = render() - const cardHeaderTestEl = queryByTestId(cardHeaderTestId) - let cliResultEl = queryByTestId(cliResultTestId) + const cliResultEl = queryByTestId(cliResultTestId) + + expect(cliResultEl).toBeInTheDocument() + }) + + it('Cli result should not in the document when "isOpen = true"', () => { + const cliResultTestId = 'query-cli-result' + + const mockResult = [{ + response: 'response', + status: 'success' + }] + + const { queryByTestId } = render() + + const cliResultEl = queryByTestId(cliResultTestId) expect(cliResultEl).not.toBeInTheDocument() + }) - fireEvent.click(cardHeaderTestEl) + it('Click on the header should call toggleOpenWBResult', () => { + const cardHeaderTestId = 'query-card-open' + const mockId = '123' - cliResultEl = queryByTestId(cliResultTestId) + const mockResult = [{ + response: 'response', + status: 'success' + }] - expect(cliResultEl).toBeInTheDocument() + const { queryByTestId } = render() + + const cardHeaderTestEl = queryByTestId(cardHeaderTestId) + + fireEvent.click(cardHeaderTestEl) + + const expectedActions = [toggleOpenWBResult(mockId)] + expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual( + clearStoreActions(expectedActions) + ) }) }) diff --git a/redisinsight/ui/src/components/query-card/QueryCard.tsx b/redisinsight/ui/src/components/query-card/QueryCard.tsx index 3e9785aa90..41f961b147 100644 --- a/redisinsight/ui/src/components/query-card/QueryCard.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCard.tsx @@ -1,34 +1,37 @@ import React, { useEffect, useState } from 'react' -import { useSelector } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' import cx from 'classnames' import { EuiLoadingContent, keys } from '@elastic/eui' import { useParams } from 'react-router-dom' import { WBQueryType } from 'uiSrc/pages/workbench/constants' -import { getWBQueryType, Nullable, getVisualizationsByCommand, Maybe } from 'uiSrc/utils' +import { + getWBQueryType, + getVisualizationsByCommand, + Maybe +} from 'uiSrc/utils' import { appPluginsSelector } from 'uiSrc/slices/app/plugins' -import { IPluginVisualization } from 'uiSrc/slices/interfaces' -import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' +import { CommandExecutionResult, IPluginVisualization } from 'uiSrc/slices/interfaces' import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' +import { toggleOpenWBResult } from 'uiSrc/slices/workbench/wb-results' import QueryCardHeader from './QueryCardHeader' import QueryCardCliResult from './QueryCardCliResult' import QueryCardCliPlugin from './QueryCardCliPlugin' -import QueryCardCommonResult from './QueryCardCommonResult' +import QueryCardCommonResult, { CommonErrorResponse } from './QueryCardCommonResult' import styles from './styles.module.scss' export interface Props { - id: number; - query: string; - data: any; - status: Maybe; - fromStore: boolean; - time?: number; - loading?: boolean; - onQueryRun: (queryType: WBQueryType) => void; - onQueryDelete: () => void; - onQueryReRun: () => void; + id: string + command: string + isOpen: boolean + result: Maybe + createdAt?: Date + loading?: boolean + onQueryDelete: () => void + onQueryReRun: () => void + onQueryOpen: () => void } const getDefaultPlugin = (views: IPluginVisualization[], query: string) => @@ -37,12 +40,11 @@ const getDefaultPlugin = (views: IPluginVisualization[], query: string) => const QueryCard = (props: Props) => { const { id, - query = '', - data, - status, - fromStore, - time, - onQueryRun, + command = '', + result, + isOpen, + createdAt, + onQueryOpen, onQueryDelete, onQueryReRun, loading @@ -51,16 +53,16 @@ const QueryCard = (props: Props) => { const { visualizations = [] } = useSelector(appPluginsSelector) const { instanceId = '' } = useParams<{ instanceId: string }>() - const [isOpen, setIsOpen] = useState(!fromStore) const [isFullScreen, setIsFullScreen] = useState(false) - const [result, setResult] = useState>(data) - const [queryType, setQueryType] = useState(getWBQueryType(query, visualizations)) + const [queryType, setQueryType] = useState(getWBQueryType(command, visualizations)) const [viewTypeSelected, setViewTypeSelected] = useState(queryType) const [summaryText, setSummaryText] = useState('') const [selectedViewValue, setSelectedViewValue] = useState( - getDefaultPlugin(visualizations, query) || queryType + getDefaultPlugin(visualizations, command) || queryType ) + const dispatch = useDispatch() + useEffect(() => { window.addEventListener('keydown', handleEscFullScreen) return () => { @@ -89,31 +91,25 @@ const QueryCard = (props: Props) => { } useEffect(() => { - setQueryType(getWBQueryType(query, visualizations)) - }, [query]) + setQueryType(getWBQueryType(command, visualizations)) + }, [command]) useEffect(() => { if (visualizations.length) { - const type = getWBQueryType(query, visualizations) + const type = getWBQueryType(command, visualizations) setQueryType(type) setViewTypeSelected(type) - setSelectedViewValue(getDefaultPlugin(visualizations, query) || queryType) + setSelectedViewValue(getDefaultPlugin(visualizations, command) || queryType) } }, [visualizations]) - useEffect(() => { - if (data !== undefined) { - setResult(data) - } - }, [data, time]) - const toggleOpen = () => { if (isFullScreen) return - setIsOpen(!isOpen) + dispatch(toggleOpenWBResult(id)) - if (!isOpen && !data) { - onQueryRun(queryType) + if (!isOpen && !result) { + onQueryOpen() } } @@ -122,6 +118,8 @@ const QueryCard = (props: Props) => { setSelectedViewValue(value) } + const commonError = CommonErrorResponse(command, result) + return (
{ { /> {isOpen && ( <> - {React.isValidElement(result) - ? + {React.isValidElement(commonError) + ? : ( <> {viewTypeSelected === WBQueryType.Plugin && ( @@ -158,9 +157,9 @@ const QueryCard = (props: Props) => { ) : (
@@ -170,7 +169,11 @@ const QueryCard = (props: Props) => { )} {viewTypeSelected === WBQueryType.Text && ( - + )} )} diff --git a/redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx b/redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx index 398c138872..bc145f69fa 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx @@ -4,23 +4,28 @@ import cx from 'classnames' import { EuiFlexItem, EuiIcon, EuiLoadingContent, EuiTextColor } from '@elastic/eui' import { pluginApi } from 'uiSrc/services/PluginAPI' import { ThemeContext } from 'uiSrc/contexts/themeContext' -import { getBaseApiUrl, Nullable, Maybe } from 'uiSrc/utils' +import { getBaseApiUrl, Nullable } from 'uiSrc/utils' import { Theme } from 'uiSrc/constants' -import { IPluginVisualization } from 'uiSrc/slices/interfaces' +import { CommandExecutionResult, IPluginVisualization } from 'uiSrc/slices/interfaces' import { PluginEvents } from 'uiSrc/plugins/pluginEvents' import { prepareIframeHtml } from 'uiSrc/plugins/pluginImport' -import { appPluginsSelector, sendPluginCommandAction } from 'uiSrc/slices/app/plugins' +import { + appPluginsSelector, + getPluginStateAction, + sendPluginCommandAction, + setPluginStateAction +} from 'uiSrc/slices/app/plugins' import { connectedInstanceSelector } from 'uiSrc/slices/instances' -import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' +import { appServerInfoSelector } from 'uiSrc/slices/app/info' import styles from './styles.module.scss' export interface Props { - result: any + result: CommandExecutionResult[] query: any id: string - status: Maybe setSummaryText: (text: string) => void + commandId: string } enum StylesNamePostfix { @@ -29,12 +34,18 @@ enum StylesNamePostfix { Global = '/global_styles.css' } +enum ActionTypes { + Resolve = 'resolve', + Reject = 'reject' +} + const baseUrl = getBaseApiUrl() const QueryCardCliPlugin = (props: Props) => { - const { result, query, id, status, setSummaryText } = props + const { query, id, result, setSummaryText, commandId } = props const { visualizations = [], staticPath } = useSelector(appPluginsSelector) const { modules = [] } = useSelector(connectedInstanceSelector) + const serverInfo = useSelector(appServerInfoSelector) const [currentView, setCurrentView] = useState>(null) const [currentPlugin, setCurrentPlugin] = useState>(null) @@ -45,6 +56,8 @@ const QueryCardCliPlugin = (props: Props) => { const generatedIframeNameRef = useRef('') const { theme } = useContext(ThemeContext) + const dispatch = useDispatch() + const sendMessageToPlugin = (data = {}) => { const event: any = document.createEvent('Event') event.initEvent('message', false, false) @@ -57,10 +70,91 @@ const QueryCardCliPlugin = (props: Props) => { sendMessageToPlugin({ event: 'executeCommand', method: currentView.activationMethod, - data: { command: query, data: result, status } + data: { command: query, data: result } }) } + const sendRedisCommand = ({ command = '', requestId = '' }: { command: string, requestId: string }) => { + const commonOptions = { + event: PluginEvents.executeRedisCommand, + requestId, + } + dispatch( + sendPluginCommandAction({ + command, + onSuccessAction: (response) => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Resolve, + data: response.result + }) + }, + onFailAction: (error: any) => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Reject, + data: error + }) + } + }) + ) + } + + const getPluginState = ({ requestId }: { requestId: string }) => { + const commonOptions = { + event: PluginEvents.getState, + requestId, + } + dispatch( + getPluginStateAction({ + visualizationId: id, + commandId, + onSuccessAction: (response) => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Resolve, + data: response?.state ?? null + }) + }, + onFailAction: (error: any) => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Reject, + data: error + }) + } + }) + ) + } + + const setPluginState = ({ requestId, state }: { requestId: string, state: any }) => { + const commonOptions = { + event: PluginEvents.setState, + requestId, + } + dispatch( + setPluginStateAction({ + visualizationId: id, + commandId, + pluginState: state, + onSuccessAction: () => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Resolve, + data: state + }) + }, + onFailAction: (error: any) => { + sendMessageToPlugin({ + ...commonOptions, + actionType: ActionTypes.Reject, + data: error + }) + } + }) + ) + } + useEffect(() => { if (currentView === null) return pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.heightChanged, (height: string) => { @@ -85,11 +179,9 @@ const QueryCardCliPlugin = (props: Props) => { setSummaryText(text) }) - // pluginApi.onEvent( - // generatedIframeNameRef.current, - // 'executeRedisCommand', - // sendRedisCommand - // ) + pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.executeRedisCommand, sendRedisCommand) + pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.getState, getPluginState) + pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.setState, setPluginState) }, [currentView]) const renderPluginIframe = (config: any) => { @@ -129,6 +221,7 @@ const QueryCardCliPlugin = (props: Props) => { scriptSrc: `${baseUrl}${plugin.scriptSrc}`, stylesSrc: generateStylesSrc(plugin.stylesSrc), iframeId: generatedIframeNameRef.current, + appVersion: serverInfo?.appVersion, }) setCurrentPlugin(plugin?.name || null) return diff --git a/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.spec.tsx b/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.spec.tsx index 33cae89641..1ed05e2ddf 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.spec.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.spec.tsx @@ -25,36 +25,33 @@ jest.mock('uiSrc/services', () => ({ describe('QueryCardCliResult', () => { it('should render', () => { - // connectedInstanceSelector.mockImplementation(() => ({ - // id: '123', - // connectionType: 'CLUSTER', - // })); - - // const sendCliClusterActionMock = jest.fn(); - - // sendCliClusterCommandAction.mockImplementation(() => sendCliClusterActionMock); - expect(render()).toBeTruthy() }) it('Result element should render with result prop', () => { - const result = '123' + const mockResult = [{ + response: 'response', + status: 'success' + }] const { queryByTestId } = render( - + ) const resultEl = queryByTestId(resultTestId) expect(resultEl).toBeInTheDocument() - expect(resultEl).toHaveTextContent(result) + expect(resultEl).toHaveTextContent(mockResult?.[0]?.response) }) it('Result element should render (nil) result', () => { - const result = '' + const mockResult = [{ + response: '', + status: 'success' + }] const { queryByTestId } = render( - + ) const resultEl = queryByTestId(resultTestId) diff --git a/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx b/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx index 2387fdb4df..903781b615 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx @@ -2,26 +2,26 @@ import React from 'react' import cx from 'classnames' import { EuiLoadingContent } from '@elastic/eui' -import { cliParseTextResponse, CliPrefix, Maybe } from 'uiSrc/utils' -import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' +import { CommandExecutionResult } from 'uiSrc/slices/interfaces' +import { cliParseTextResponse, CliPrefix, Maybe, } from 'uiSrc/utils' import styles from './styles.module.scss' export interface Props { - status: Maybe; query: string; - result: any; + result: Maybe loading?: boolean; } const QueryCardCliResult = (props: Props) => { - const { result, query, status, loading } = props + const { result = [], query, loading } = props return (
{!loading && (
- {cliParseTextResponse(result || '(nil)', query, status, CliPrefix.QueryCard)} + {result?.map(({ response, status }) => + cliParseTextResponse(response || '(nil)', query, status, CliPrefix.QueryCard))}
)} {loading && ( diff --git a/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/CommonErrorResponse.tsx b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/CommonErrorResponse.tsx new file mode 100644 index 0000000000..fa2eb64880 --- /dev/null +++ b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/CommonErrorResponse.tsx @@ -0,0 +1,72 @@ +import React from 'react' +import { useSelector } from 'react-redux' +import { + checkUnsupportedCommand, + checkUnsupportedModuleCommand, + cliParseTextResponse, + getCommandRepeat, + isRepeatCountCorrect +} from 'uiSrc/utils' +import { cliTexts, SelectCommand } from 'uiSrc/constants/cliOutput' +import { CommandMonitor } from 'uiSrc/constants' +import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' +import { RedisDefaultModules } from 'uiSrc/slices/interfaces' +import { RSNotLoadedContent } from 'uiSrc/pages/workbench/constants' + +import { cliSettingsSelector } from 'uiSrc/slices/cli/cli-settings' +import { connectedInstanceSelector } from 'uiSrc/slices/instances' +import ModuleNotLoaded from 'uiSrc/pages/workbench/components/module-not-loaded' + +const CommonErrorResponse = (command = '', result?: any) => { + const { unsupportedCommands: cliUnsupportedCommands, blockingCommands } = useSelector(cliSettingsSelector) + const { modules } = useSelector(connectedInstanceSelector) + const unsupportedCommands = [SelectCommand.toLowerCase(), ...cliUnsupportedCommands, ...blockingCommands] + const [commandLine, countRepeat] = getCommandRepeat(command) + + // Flow if monitor command was executed + if (checkUnsupportedCommand([CommandMonitor.toLowerCase()], commandLine)) { + return cliParseTextResponse( + cliTexts.MONITOR_COMMAND, + commandLine, + CommandExecutionStatus.Fail, + ) + } + + const unsupportedCommand = checkUnsupportedCommand(unsupportedCommands, commandLine) + + if (result === null) { + return cliParseTextResponse( + cliTexts.UNABLE_TO_DECRYPT, + '', + CommandExecutionStatus.Fail, + ) + } + + if (!isRepeatCountCorrect(countRepeat)) { + return cliParseTextResponse( + cliTexts.REPEAT_COUNT_INVALID, + commandLine, + CommandExecutionStatus.Fail, + ) + } + + if (unsupportedCommand) { + return cliParseTextResponse( + cliTexts.WORKBENCH_UNSUPPORTED_COMMANDS( + commandLine.slice(0, unsupportedCommand.length), + [...blockingCommands, ...unsupportedCommands].join(', '), + ), + commandLine, + CommandExecutionStatus.Fail, + ) + } + const unsupportedModule = checkUnsupportedModuleCommand(modules, commandLine) + + if (unsupportedModule === RedisDefaultModules.Search) { + return + } + + return null +} + +export default CommonErrorResponse diff --git a/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/index.ts b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/index.ts new file mode 100644 index 0000000000..c9a5964599 --- /dev/null +++ b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/index.ts @@ -0,0 +1,3 @@ +import CommonErrorResponse from './CommonErrorResponse' + +export default CommonErrorResponse diff --git a/redisinsight/ui/src/components/query-card/QueryCardCommonResult/index.ts b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/index.ts index c9df6194bd..bf24d9b678 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardCommonResult/index.ts +++ b/redisinsight/ui/src/components/query-card/QueryCardCommonResult/index.ts @@ -1,3 +1,6 @@ import QueryCardCommonResult from './QueryCardCommonResult' +import CommonErrorResponse from './components/CommonErrorResponse' + +export { CommonErrorResponse } export default QueryCardCommonResult diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx index 976bf1fa40..889b64287c 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx @@ -11,7 +11,7 @@ import { EuiTextColor, EuiToolTip, } from '@elastic/eui' -import { format } from 'date-fns' +import { format, parseISO } from 'date-fns' import { useParams } from 'react-router-dom' import { findIndex } from 'lodash' @@ -35,10 +35,11 @@ export interface Props { query: string; isOpen: boolean; isFullScreen: boolean; - time?: number; + createdAt?: Date; summaryText?: string; queryType: WBQueryType; selectedValue: string; + loading?: boolean; toggleOpen: () => void; toggleFullScreen: () => void; setSelectedValue: (type: WBQueryType, value: string) => void; @@ -53,8 +54,9 @@ const QueryCardHeader = (props: Props) => { isFullScreen, toggleFullScreen, query = '', + loading, summaryText, - time, + createdAt, selectedValue, setSelectedValue, onQueryDelete, @@ -116,8 +118,8 @@ const QueryCardHeader = (props: Props) => { onQueryReRun() } - const getLocaleTime = () => (time - && format(time, `${new Date(time).getFullYear() === new Date().getFullYear() ? 'LLL d,' : 'PP'} HH:mm:ss`) + const getFormatTime = () => (createdAt + && format(parseISO(createdAt?.toString()), `${parseISO(createdAt?.toString()).getFullYear() === new Date().getFullYear() ? 'LLL d,' : 'PP'} HH:mm:ss`) ) || '' const isViewInternal = (view: string = '') => !!options.find(({ id }) => id === view)?.internal @@ -230,7 +232,10 @@ const QueryCardHeader = (props: Props) => { role="button" > - +
@@ -243,10 +248,10 @@ const QueryCardHeader = (props: Props) => { />
- - {!!time && ( + + {!!createdAt && ( - {getLocaleTime()} + {getFormatTime()} )} {!!summaryText && !isOpen && ( @@ -292,7 +297,13 @@ const QueryCardHeader = (props: Props) => { )} - + {!isFullScreen && ( diff --git a/redisinsight/ui/src/constants/api.ts b/redisinsight/ui/src/constants/api.ts index 7037010045..653706ffa7 100644 --- a/redisinsight/ui/src/constants/api.ts +++ b/redisinsight/ui/src/constants/api.ts @@ -38,13 +38,16 @@ enum ApiEndpoints { CLI_UNSUPPORTED_COMMANDS = 'info/cli-unsupported-commands', SEND_COMMAND = 'send-command', SEND_CLUSTER_COMMAND = 'send-cluster-command', + COMMAND_EXECUTIONS = 'command-executions', INFO = 'info', SETTINGS = 'settings', SETTINGS_AGREEMENTS_SPEC = 'settings/agreements/spec', + WORKBENCH_COMMAND_EXECUTIONS = 'workbench/command-executions', REDIS_COMMANDS = 'commands', ENABLEMENT_AREA = 'static/workbench/enablement-area.json', - PLUGINS = 'plugins' + PLUGINS = 'plugins', + STATE = 'state', } export const DEFAULT_SEARCH_MATCH = '*' diff --git a/redisinsight/ui/src/constants/apiErrors.ts b/redisinsight/ui/src/constants/apiErrors.ts index 912d03d295..9ef97a381d 100644 --- a/redisinsight/ui/src/constants/apiErrors.ts +++ b/redisinsight/ui/src/constants/apiErrors.ts @@ -3,6 +3,7 @@ enum ApiErrors { KeytarUnavailable = 'KeytarUnavailable', KeytarEncryption = 'KeytarEncryptionError', KeytarDecryption = 'KeytarDecryptionError', + ClientNotFound = 'ClientNotFoundError' } export const ApiEncryptionErrors: string[] = [ diff --git a/redisinsight/ui/src/constants/cliOutput.tsx b/redisinsight/ui/src/constants/cliOutput.tsx index 1eaffc6b20..dbd2c0bf1e 100644 --- a/redisinsight/ui/src/constants/cliOutput.tsx +++ b/redisinsight/ui/src/constants/cliOutput.tsx @@ -2,18 +2,20 @@ import { EuiTextColor } from '@elastic/eui' import React from 'react' export const ClearCommand = 'clear' +export const SelectCommand = 'select' export enum CliOutputFormatterType { Text = 'TEXT', Raw = 'RAW', } -export const InitOutputText = (host: string = '', port: number = 0) => [ +export const InitOutputText = (host: string = '', port: number = 0, dbIndex: number = 0) => [ 'Connecting...', '\n\n', 'Pinging Redis server on ', {`${host}:${port}`} + {dbIndex > 0 && `[${dbIndex}]`} , ] @@ -22,7 +24,7 @@ export const ConnectionSuccessOutputText = [ 'Connected.', '\n', 'Ready to execute commands.', - '\n\n\n', + '\n\n', ] const unsupportedCommandTextCli = ' is not supported by the RedisInsight CLI. The list of all unsupported commands: ' @@ -32,4 +34,17 @@ export const cliTexts = { commandLine + unsupportedCommandTextCli + commands, WORKBENCH_UNSUPPORTED_COMMANDS: (commandLine: string, commands: string) => commandLine + unsupportedCommandTextWorkbench + commands, + REPEAT_COUNT_INVALID: 'Invalid repeat command option value', + CONNECTION_CLOSED: 'Client connection previously closed. Run the command after the connection is re-created.', + MONITOR_COMMAND: 'Use the "Profiler" tool to see all the requests processed by the server.', + UNABLE_TO_DECRYPT: 'Unable to decrypt. Check the system keychain or re-run the command.', + CLI_ERROR_MESSAGE: (message: string) => ( + [ + '\n', + + {message} + , + '\n\n', + ] + ) } diff --git a/redisinsight/ui/src/constants/commands.ts b/redisinsight/ui/src/constants/commands.ts index 157ebdaf90..082741fc0b 100644 --- a/redisinsight/ui/src/constants/commands.ts +++ b/redisinsight/ui/src/constants/commands.ts @@ -48,7 +48,7 @@ export enum CommandGroup { Scripting = 'scripting', Transactions = 'transactions', Server = 'server', - SortedSet = 'sorted_set', + SortedSet = 'sorted-set', HyperLogLog = 'hyperloglog', Hash = 'hash', Set = 'set', @@ -59,7 +59,10 @@ export enum CommandGroup { JSON = 'json', TimeSeries = 'timeseries', Graph = 'graph', - AI = 'ai' + AI = 'ai', + TDigest = 'tdigest', + CMS = 'cms', + TopK = 'topk', } export enum CommandPrefix { @@ -67,9 +70,16 @@ export enum CommandPrefix { Graph = 'GRAPH', TimeSeries = 'TS', Search = 'FT', - JSON = 'JSON' + JSON = 'JSON', + Gears = 'RG', + BloomFilter = 'BF', + CuckooFilter = 'CF', + CountMinSketchFilter = 'CMS', + TopK = 'TOPK', } +export const CommandMonitor = 'MONITOR' + export enum CommandRediSearch { Search = 'FT.SEARCH', Aggregate = 'FT.AGGREGATE', diff --git a/redisinsight/ui/src/constants/index.ts b/redisinsight/ui/src/constants/index.ts index 64f2b79a75..3cd6b3eb0b 100644 --- a/redisinsight/ui/src/constants/index.ts +++ b/redisinsight/ui/src/constants/index.ts @@ -13,6 +13,9 @@ export * from './monacoRedis' export * from './keyboardShortcuts' export * from './pages' export * from './workbenchResults' +export * from './monitorEvents' +export * from './socketEvents' export * from './mocks/mock-redis-commands' export * from './mocks/mock-enablement-area' +export * from './socketErrors' export { ApiEndpoints, BrowserStorageItem, ApiStatusCode, apiErrors } diff --git a/redisinsight/ui/src/constants/keys.ts b/redisinsight/ui/src/constants/keys.ts index b8c8e506f0..9696a10d0f 100644 --- a/redisinsight/ui/src/constants/keys.ts +++ b/redisinsight/ui/src/constants/keys.ts @@ -39,6 +39,9 @@ export const GROUP_TYPES_DISPLAY = Object.freeze({ [CommandGroup.Server]: 'Server', [CommandGroup.SortedSet]: 'Sorted Set', [CommandGroup.HyperLogLog]: 'HyperLogLog', + [CommandGroup.CMS]: 'CMS', + [CommandGroup.TDigest]: 'TDigest', + [CommandGroup.TopK]: 'TopK', }) // Enums don't allow to use dynamic key diff --git a/redisinsight/ui/src/constants/monitorEvents.ts b/redisinsight/ui/src/constants/monitorEvents.ts new file mode 100644 index 0000000000..a401dbda0a --- /dev/null +++ b/redisinsight/ui/src/constants/monitorEvents.ts @@ -0,0 +1,5 @@ +export enum MonitorEvent { + Monitor = 'monitor', + MonitorData = 'monitorData', + Exception = 'exception', +} diff --git a/redisinsight/ui/src/constants/socketErrors.ts b/redisinsight/ui/src/constants/socketErrors.ts new file mode 100644 index 0000000000..ab9498f607 --- /dev/null +++ b/redisinsight/ui/src/constants/socketErrors.ts @@ -0,0 +1,3 @@ +export enum SocketErrors { + TransportError = 'TransportError', +} diff --git a/redisinsight/ui/src/constants/socketEvents.ts b/redisinsight/ui/src/constants/socketEvents.ts new file mode 100644 index 0000000000..903cdb29f9 --- /dev/null +++ b/redisinsight/ui/src/constants/socketEvents.ts @@ -0,0 +1,5 @@ +export enum SocketEvent { + Connect = 'connect', + Disconnect = 'disconnect', + ConnectionError = 'connect_error', +} diff --git a/redisinsight/ui/src/constants/workbenchResults.ts b/redisinsight/ui/src/constants/workbenchResults.ts index 2ab6ec62b3..b0e897050e 100644 --- a/redisinsight/ui/src/constants/workbenchResults.ts +++ b/redisinsight/ui/src/constants/workbenchResults.ts @@ -1 +1 @@ -export const bulkReplyCommands = ['LOLWUT', 'INFO', 'CLIENT', 'CLUSTER', 'MEMORY'] +export const bulkReplyCommands = ['LOLWUT', 'INFO', 'CLIENT', 'CLUSTER', 'MEMORY', 'MONITOR'] diff --git a/redisinsight/ui/src/electron/constants/ipcEvent.ts b/redisinsight/ui/src/electron/constants/ipcEvent.ts index 951d4510f1..2772dc7649 100644 --- a/redisinsight/ui/src/electron/constants/ipcEvent.ts +++ b/redisinsight/ui/src/electron/constants/ipcEvent.ts @@ -1,6 +1,7 @@ enum ipcEvent { getStoreValue = 'getStoreValue', deleteStoreValue = 'deleteStoreValue', + getAppVersion = 'getAppVersion', } export default ipcEvent diff --git a/redisinsight/ui/src/packages/clients-list-example/src/App.tsx b/redisinsight/ui/src/packages/clients-list-example/src/App.tsx index b02cd0cb35..146d30f779 100644 --- a/redisinsight/ui/src/packages/clients-list-example/src/App.tsx +++ b/redisinsight/ui/src/packages/clients-list-example/src/App.tsx @@ -9,9 +9,8 @@ import { } from './utils' interface Props { - command: string, - response: any, - status: string + command: string + result?: { response: any, status: string }[] } // This is problematic for some bundlers and/or deployments, @@ -19,7 +18,7 @@ interface Props { appendIconComponentCache(cachedIcons) const App = (props: Props) => { - const { command = '', response = '', status = '' } = props + const { command = '', result: [{ response = '', status = '' } = {}] = [] } = props const result = parseResponse(response) diff --git a/redisinsight/ui/src/packages/clients-list-example/src/main.tsx b/redisinsight/ui/src/packages/clients-list-example/src/main.tsx index 51359287e9..4ad59e222c 100644 --- a/redisinsight/ui/src/packages/clients-list-example/src/main.tsx +++ b/redisinsight/ui/src/packages/clients-list-example/src/main.tsx @@ -1,23 +1,22 @@ /* eslint-disable react/jsx-filename-extension */ import React from 'react' import { render } from 'react-dom' -import response from './response.json' +import result from './result.json' import App from './App' interface Props { command?: string - data?: any - status?: string + data?: { response: any, status: string }[] } const renderClientsList = (props:Props) => { - const { command = '', status = '', data: response = {} } = props - render(, + const { command = '', data: result = [] } = props + render(, document.getElementById('app')) } if (process.env.NODE_ENV === 'development') { - renderClientsList({ command: '', data: response, status: 'success' }) + renderClientsList({ command: '', data: result || [] }) } // This is a required action - export the main function for execution of the visualization diff --git a/redisinsight/ui/src/packages/clients-list-example/src/response.json b/redisinsight/ui/src/packages/clients-list-example/src/response.json deleted file mode 100644 index 2939bda20f..0000000000 --- a/redisinsight/ui/src/packages/clients-list-example/src/response.json +++ /dev/null @@ -1 +0,0 @@ -"id=13091001001 addr=172.17.0.1:55380 fd=97 name=redisinsight-cli-bc31a9f9 age=2 idle=2 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=CLIENT user=default\r\nid=6001002 addr=172.17.0.1:43276 fd=99 name=redisinsight-browser-808492c8 age=6561 idle=6561 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=TTL user=default\r\nid=3765001002 addr=172.17.0.1:59014 fd=100 name=redisinsight-common-1239970f age=4681 idle=4681 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=INFO user=default\r\n" diff --git a/redisinsight/ui/src/packages/clients-list-example/src/result.json b/redisinsight/ui/src/packages/clients-list-example/src/result.json new file mode 100644 index 0000000000..adbe57ff9a --- /dev/null +++ b/redisinsight/ui/src/packages/clients-list-example/src/result.json @@ -0,0 +1,6 @@ +[ + { + "status": "success", + "response": "id=13091001001 addr=172.17.0.1:55380 fd=97 name=redisinsight-cli-bc31a9f9 age=2 idle=2 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=CLIENT user=default\r\nid=6001002 addr=172.17.0.1:43276 fd=99 name=redisinsight-browser-808492c8 age=6561 idle=6561 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=TTL user=default\r\nid=3765001002 addr=172.17.0.1:59014 fd=100 name=redisinsight-common-1239970f age=4681 idle=4681 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=2147483647 obl=0 oll=0 omem=0 events=r cmd=INFO user=default\r\n" + } +] diff --git a/redisinsight/ui/src/packages/enablement-area/quick-guides/document/introduction.md b/redisinsight/ui/src/packages/enablement-area/quick-guides/document/introduction.md index eed5ad93d4..2bf3062cf4 100644 --- a/redisinsight/ui/src/packages/enablement-area/quick-guides/document/introduction.md +++ b/redisinsight/ui/src/packages/enablement-area/quick-guides/document/introduction.md @@ -18,8 +18,8 @@ Follow these instructions to set up the RedisJSON and RediSearch modules on Redis OSS.\ \ -For working with Hashes you will need Redis {">"}=6, [RediSearch](https://oss.redis.com/redisearch/) {">"}=2.0.\ +For working with Hashes you will need Redis >=6, [RediSearch](https://oss.redis.com/redisearch/) >=2.0.\ \ -For working with JSON you will need Redis {">"}=6, [RediSearch](https://oss.redis.com/redisearch/) {">"}=2.2 and [RedisJSON](https://oss.redis.com/redisjson/) {">"}=2.0.\ +For working with JSON you will need Redis >=6, [RediSearch](https://oss.redis.com/redisearch/) >=2.2 and [RedisJSON](https://oss.redis.com/redisjson/) >=2.0.\ \ You could also create a free and ready to use instance on [Redis Cloud](https://redis.com/try-free/?utm_source=redis\&utm_medium=app\&utm_campaign=redisinsight_doc_guide). diff --git a/redisinsight/ui/src/packages/enablement-area/quick-guides/document/working-with-json.md b/redisinsight/ui/src/packages/enablement-area/quick-guides/document/working-with-json.md index 8c5d52edaa..01f5adc6d2 100644 --- a/redisinsight/ui/src/packages/enablement-area/quick-guides/document/working-with-json.md +++ b/redisinsight/ui/src/packages/enablement-area/quick-guides/document/working-with-json.md @@ -50,11 +50,12 @@ Click on the button, see the command and the comments in the Workbench editor, a // It is possible to index either every hash or every JSON document in the keyspace or configure indexing only for a subset of the same data type documents described by a prefix. // RedisJSON supports JSONPath, so we can easily access and index nested properties and array elements. - // Note that you cannot index values that contain JSON objects or JSON arrays. To be indexed, a JSONPath expression must return a single scalar value (string or number). If the JSONPath expression returns an object or an array, it will be ignored. + // Note that you cannot index values that contain JSON objects. To be indexed, a JSONPath expression must return a single scalar value (string, number, or geo). If the JSONPath expression returns an object, it will be ignored. If the JSONPath expression returns multiple scalar values (string or boolean), or if it returns an array of string or boolean values, the values can be indexed only as TAG. // JSON Strings can only be indexed as TEXT, TAG and GEO (using the right syntax). // JSON numbers can only be indexed as NUMERIC. - // Boolean and NULL values are ignored. + // JSON Boolean can only be indexed as TAG. + // NULL values are ignored. // Command to create an index on JSON keys that are prefixed with "school:" diff --git a/redisinsight/ui/src/packages/random-key-example/package.json b/redisinsight/ui/src/packages/random-key-example/package.json new file mode 100644 index 0000000000..22a2c7fcb6 --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/package.json @@ -0,0 +1,61 @@ +{ + "author": { + "name": "Redis Ltd.", + "email": "support@redis.com", + "url": "https://redis.com/redis-enterprise/redis-insight" + }, + "bugs": { + "url": "https://github.com/" + }, + "description": "Show random key", + "source": "./src/index.tsx", + "styles": "./dist/styles.css", + "main": "./dist/index.js", + "name": "random-key", + "version": "0.0.1", + "scripts": { + "start": "cross-env NODE_ENV=development parcel serve src/index.html", + "build": "rimraf dist && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\" \"yarn build:css\" \"yarn build:assets\"", + "build:js": "parcel build src/main.tsx --no-source-maps --no-cache --dist-dir dist", + "build:css": "parcel build src/styles/styles.scss --no-source-maps --no-cache --dist-dir dist", + "build:css:dark": "parcel build src/styles/dark_theme.scss --no-source-maps --no-cache --dist-dir dist", + "build:css:light": "parcel build src/styles/light_theme.scss --no-source-maps --no-cache --dist-dir dist", + "build:assets": "parcel build src/assets/**/* --dist-dir dist", + "minify:js": "terser --compress --mangle -- dist/main.js > dist/index.js && rimraf dist/main.js" + }, + "targets": { + "main": false, + "module": { + "includeNodeModules": true + } + }, + "visualizations": [ + { + "id": "random-key", + "name": "Randomize", + "activationMethod": "renderRandomKey", + "matchCommands": [ + "RANDOMKEY" + ], + "description": "Example of random key plugin", + "default": true + } + ], + "devDependencies": { + "@parcel/compressor-brotli": "^2.0.0", + "@parcel/compressor-gzip": "^2.0.0", + "@parcel/transformer-sass": "^2.0.0", + "concurrently": "^6.3.0", + "cross-env": "^7.0.3", + "parcel": "^2.0.0", + "rimraf": "^3.0.2", + "terser": "^5.9.0" + }, + "dependencies": { + "@elastic/datemath": "^5.0.3", + "@elastic/eui": "^36.0.0", + "classnames": "^2.3.1", + "react": "^17.0.2", + "react-dom": "^17.0.2" + } +} diff --git a/redisinsight/ui/src/packages/random-key-example/src/App.tsx b/redisinsight/ui/src/packages/random-key-example/src/App.tsx new file mode 100644 index 0000000000..107c004de3 --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/src/App.tsx @@ -0,0 +1,73 @@ +/* eslint-disable react/jsx-filename-extension */ +import React, { useEffect, useState } from 'react' +import { EuiText, EuiButton, EuiSpacer, EuiTextColor } from '@elastic/eui' + +interface Props { + result?: { response: any, status: string }[] +} + +const App = (props: Props) => { + const { result: [{ response = '' } = {}] = [] } = props + const [lastRandomKey, setLastRandomKey] = useState('') + + useEffect(() => { + getLastRandomKey() + }, []) + + const getLastRandomKey = async () => { + try { + const result = await globalThis.PluginSDK?.getState() + setLastRandomKey(result) + } catch (e) { + console.error(e) + } + } + + const updateLastRandomKey = async (key: string) => { + try { + const result = await globalThis.PluginSDK?.setState(key) + setLastRandomKey(result) + } catch (error) { + console.error(error) + } + } + + const randomizeKey = async () => { + try { + const result = await globalThis.PluginSDK?.executeRedisCommand('RANDOMKEY') + const [{ response = '', status }] = result + if (status === 'success') { + updateLastRandomKey(response) + } + } catch (e) { + console.error(e) + } + } + + return ( +
+ + Initial Key: +   + { response } + + + Last Random Key: +   + { lastRandomKey } + + + + Random new key + +
+ ) +} + +export default App diff --git a/redisinsight/ui/src/packages/random-key-example/src/index.html b/redisinsight/ui/src/packages/random-key-example/src/index.html new file mode 100644 index 0000000000..e367b7d9f6 --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/src/index.html @@ -0,0 +1,17 @@ + + + + + + + Random key plugin + + + + + + + +
+ + diff --git a/redisinsight/ui/src/packages/random-key-example/src/main.tsx b/redisinsight/ui/src/packages/random-key-example/src/main.tsx new file mode 100644 index 0000000000..1eab417684 --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/src/main.tsx @@ -0,0 +1,22 @@ +/* eslint-disable react/jsx-filename-extension */ +import React from 'react' +import { render } from 'react-dom' +import App from './App' + +interface Props { + command?: string + data?: { response: any, status: string }[] +} + +const renderRandomKey = (props:Props) => { + const { data: result = [] } = props + render(, + document.getElementById('app')) +} + +if (process.env.NODE_ENV === 'development') { + renderRandomKey({ data: [{ response: 'key132', status: 'success' }] || [] }) +} + +// This is a required action - export the main function for execution of the visualization +export default { renderRandomKey } diff --git a/redisinsight/ui/src/packages/random-key-example/src/styles/styles.scss b/redisinsight/ui/src/packages/random-key-example/src/styles/styles.scss new file mode 100644 index 0000000000..5f11ff0cfe --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/src/styles/styles.scss @@ -0,0 +1,3 @@ +.wrapper { + padding: 20px; +} diff --git a/redisinsight/ui/src/packages/random-key-example/yarn.lock b/redisinsight/ui/src/packages/random-key-example/yarn.lock new file mode 100644 index 0000000000..ec892b7262 --- /dev/null +++ b/redisinsight/ui/src/packages/random-key-example/yarn.lock @@ -0,0 +1,5813 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== + dependencies: + "@babel/highlight" "^7.16.0" + +"@babel/compat-data@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz#ea269d7f78deb3a7826c39a4048eecda541ebdaa" + integrity sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew== + +"@babel/core@^7.12.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" + integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.0" + "@babel/helper-compilation-targets" "^7.16.0" + "@babel/helper-module-transforms" "^7.16.0" + "@babel/helpers" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + source-map "^0.5.0" + +"@babel/generator@^7.16.0", "@babel/generator@^7.9.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" + integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== + dependencies: + "@babel/types" "^7.16.0" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.8.4": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz#01d615762e796c17952c29e3ede9d6de07d235a8" + integrity sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg== + dependencies: + "@babel/compat-data" "^7.16.0" + "@babel/helper-validator-option" "^7.14.5" + browserslist "^4.16.6" + semver "^6.3.0" + +"@babel/helper-function-name@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== + dependencies: + "@babel/helper-get-function-arity" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/helper-get-function-arity@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-hoist-variables@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-member-expression-to-functions@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" + integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-module-imports@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-module-transforms@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" + integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA== + dependencies: + "@babel/helper-module-imports" "^7.16.0" + "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-validator-identifier" "^7.15.7" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/helper-optimise-call-expression@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" + integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-plugin-utils@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-replace-supers@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" + integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.16.0" + "@babel/helper-optimise-call-expression" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/helper-simple-access@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-split-export-declaration@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== + dependencies: + "@babel/types" "^7.16.0" + +"@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== + +"@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helpers@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.0.tgz#875519c979c232f41adfbd43a3b0398c2e388183" + integrity sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ== + dependencies: + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.0.0", "@babel/parser@^7.16.0": + version "7.16.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.2.tgz#3723cd5c8d8773eef96ce57ea1d9b7faaccd12ac" + integrity sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw== + +"@babel/plugin-syntax-flow@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.0.tgz#07427021d093ed77019408221beaf0272bbcfaec" + integrity sha512-dH91yCo0RyqfzWgoM5Ji9ir8fQ+uFbt9KHM3d2x4jZOuHS6wNA+CRmRUP/BWCsHG2bjc7A2Way6AvH1eQk0wig== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-flow-strip-types@^7.0.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.0.tgz#edd968dc2041c1b69e451a262e948d6654a79dc2" + integrity sha512-vs/F5roOaO/+WxKfp9PkvLsAyj0G+Q0zbFimHm9X2KDgabN2XmNFoAafmeGEYspUlIF9+MvVmyek9UyHiqeG/w== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-flow" "^7.16.0" + +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b" + integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/types" "^7.16.0" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.0.tgz#965df6c6bfc0a958c1e739284d3c9fa4a6e3c45b" + integrity sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ== + dependencies: + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.0" + "@babel/helper-function-name" "^7.16.0" + "@babel/helper-hoist-variables" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/types" "^7.16.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.12.13", "@babel/types@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + to-fast-properties "^2.0.0" + +"@elastic/datemath@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@elastic/datemath/-/datemath-5.0.3.tgz#7baccdab672b9a3ecb7fe8387580670936b58573" + integrity sha512-8Hbr1Uyjm5OcYBfEB60K7sCP6U3IXuWDaLaQmYv3UxgI4jqBWbakoemwWvsqPVUvnwEjuX6z7ghPZbefs8xiaA== + dependencies: + tslib "^1.9.3" + +"@elastic/eui@^36.0.0": + version "36.1.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-36.1.0.tgz#99946e193bc9d1616f52cbd16e1a5bc196bd450f" + integrity sha512-j09Kv5K9YBkb9NkM3+cGparJeYfjLfwyypG27UYvSOLCpOYxS3bPycwmD7QrzPjoTqH+HHzDanHSwJMp6ttabA== + dependencies: + "@types/chroma-js" "^2.0.0" + "@types/lodash" "^4.14.160" + "@types/numeral" "^0.0.28" + "@types/react-beautiful-dnd" "^13.0.0" + "@types/react-input-autosize" "^2.2.0" + "@types/react-virtualized-auto-sizer" "^1.0.0" + "@types/react-window" "^1.8.2" + "@types/refractor" "^3.0.0" + "@types/resize-observer-browser" "^0.1.5" + "@types/vfile-message" "^2.0.0" + chroma-js "^2.1.0" + classnames "^2.2.6" + lodash "^4.17.21" + mdast-util-to-hast "^10.0.0" + numeral "^2.0.6" + prop-types "^15.6.0" + react-ace "^7.0.5" + react-beautiful-dnd "^13.0.0" + react-dropzone "^11.2.0" + react-focus-on "^3.5.0" + react-input-autosize "^2.2.2" + react-is "~16.3.0" + react-virtualized-auto-sizer "^1.0.2" + react-window "^1.8.5" + refractor "^3.4.0" + rehype-raw "^5.0.0" + rehype-react "^6.0.0" + rehype-stringify "^8.0.0" + remark-emoji "^2.1.0" + remark-parse "^8.0.3" + remark-rehype "^8.0.0" + tabbable "^3.0.0" + text-diff "^1.0.1" + unified "^9.2.0" + unist-util-visit "^2.0.3" + url-parse "^1.5.3" + uuid "^8.3.0" + vfile "^4.2.0" + +"@iarna/toml@^2.2.0": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c" + integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg== + +"@mapbox/hast-util-table-cell-style@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.2.0.tgz#1003f59d54fae6f638cb5646f52110fb3da95b4d" + integrity sha512-gqaTIGC8My3LVSnU38IwjHVKJC94HSonjvFHDk8/aSrApL8v4uWgm8zJkK7MJIIbHuNOr/+Mv2KkQKcxs6LEZA== + dependencies: + unist-util-visit "^1.4.1" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@parcel/babel-ast-utils@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/babel-ast-utils/-/babel-ast-utils-2.0.1.tgz#e131e74136af878e0b2355d63acf19abbe1920db" + integrity sha512-adBHMaPAj+w1NjO+oq6SUgtOpO7wmyNIgsiHDsf8cpLf2gT0GcC/afcaC07WhIq1PJvL2hkWQpT/8sj1m/QZSw== + dependencies: + "@babel/parser" "^7.0.0" + "@parcel/babylon-walk" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + astring "^1.6.2" + +"@parcel/babylon-walk@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/babylon-walk/-/babylon-walk-2.0.1.tgz#eaedb97e57db3d40d20f6140bc3303d53e103144" + integrity sha512-eXlfG7ZGUuRF81mStZGeaYj4uH7Mgd8yfWB+c/Y13sxdacml+0vinCyZ9BjY7rYuxvKTlVSjp9BJW0Q0DS6THg== + dependencies: + "@babel/types" "^7.12.13" + lodash.clone "^4.5.0" + +"@parcel/bundler-default@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/bundler-default/-/bundler-default-2.0.1.tgz#dcffbb92c67716f9c561988b384c9c9a13074fc5" + integrity sha512-4BE86Z26gr7VHeIOCWkaucl5SNntCGS9ltk1ed65mqbZaZloZP8YD/YINxxgPtx9moTWNqQO8Y3bvCAD+VY8mQ== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/hash" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + +"@parcel/cache@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.0.1.tgz#8619d26028124377cbcec59921ba62f57c43c4f5" + integrity sha512-aXWkx6ySwHBdPWvCJ1x6aHGFWlfu9X89iKuN4X/quMHyUDqA2PkKBR0kAvcs47ZnmUAXlKI2J9BR+lEOSAJazA== + dependencies: + "@parcel/logger" "^2.0.1" + "@parcel/utils" "^2.0.1" + lmdb-store "^1.5.5" + +"@parcel/codeframe@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.0.1.tgz#b221a9082db059e1b4ae1119133fe4bfe4d923e6" + integrity sha512-NfquLg7qt8TfPmmfXVPlcq5mtEM3CvYjc+s5HLt1w0H461NiZOq7qhAaSS1N/3E+3d3eXOT/2AlCxoGm7KQ8hg== + dependencies: + chalk "^4.1.0" + emphasize "^4.2.0" + slice-ansi "^4.0.0" + string-width "^4.2.0" + +"@parcel/compressor-brotli@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/compressor-brotli/-/compressor-brotli-2.0.1.tgz#ea56a959c56a3765058e9bbab2b4c866104b61c4" + integrity sha512-p4wnjefu43rtgJye/sxNFE9k2H/9MEKXb0oGjQh5QAiSIOb9XUiDuXuzSEWuMeAUidGL//ENZE20hNMBI64/+w== + dependencies: + "@parcel/plugin" "^2.0.1" + +"@parcel/compressor-gzip@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/compressor-gzip/-/compressor-gzip-2.0.1.tgz#35352fb92bd9cbb2a2330863cd9cf00ae23043d4" + integrity sha512-y5rEi3sa0fRksfT6HJZn1G4yHjW0yCJYxe+2NSyJAv97rvVos58ZOWRMFIa8NmN2Rum20gs/LW7wH8vfz1LeVA== + dependencies: + "@parcel/plugin" "^2.0.1" + +"@parcel/compressor-raw@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/compressor-raw/-/compressor-raw-2.0.1.tgz#faa2586b0b569f9cf34c3c40206b7dd35fb8255c" + integrity sha512-0VNadPUIIpgx2MCjt7PGOwcz0OXN0BFxCmWzy+ocyEWj0KQ79OBr8ni7I3Be78OxNhE8luTEC22kVJwM0rtP1g== + dependencies: + "@parcel/plugin" "^2.0.1" + +"@parcel/config-default@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/config-default/-/config-default-2.0.1.tgz#86f13d89baa8b062ce690415df2b018c5a87a5ea" + integrity sha512-LavQo5+81wYARmDW+GsgPIV6GPG/rskR73oGHWV1oDr9k3UD2RYdGaH1GDcwqXyUEWVCw3K+nglaZdWFpOEdRQ== + dependencies: + "@parcel/bundler-default" "^2.0.1" + "@parcel/compressor-raw" "^2.0.1" + "@parcel/namer-default" "^2.0.1" + "@parcel/optimizer-cssnano" "^2.0.1" + "@parcel/optimizer-htmlnano" "^2.0.1" + "@parcel/optimizer-image" "^2.0.1" + "@parcel/optimizer-svgo" "^2.0.1" + "@parcel/optimizer-terser" "^2.0.1" + "@parcel/packager-css" "^2.0.1" + "@parcel/packager-html" "^2.0.1" + "@parcel/packager-js" "^2.0.1" + "@parcel/packager-raw" "^2.0.1" + "@parcel/packager-svg" "^2.0.1" + "@parcel/reporter-dev-server" "^2.0.1" + "@parcel/resolver-default" "^2.0.1" + "@parcel/runtime-browser-hmr" "^2.0.1" + "@parcel/runtime-js" "^2.0.1" + "@parcel/runtime-react-refresh" "^2.0.1" + "@parcel/runtime-service-worker" "^2.0.1" + "@parcel/transformer-babel" "^2.0.1" + "@parcel/transformer-css" "^2.0.1" + "@parcel/transformer-html" "^2.0.1" + "@parcel/transformer-image" "^2.0.1" + "@parcel/transformer-js" "^2.0.1" + "@parcel/transformer-json" "^2.0.1" + "@parcel/transformer-postcss" "^2.0.1" + "@parcel/transformer-posthtml" "^2.0.1" + "@parcel/transformer-raw" "^2.0.1" + "@parcel/transformer-react-refresh-wrap" "^2.0.1" + "@parcel/transformer-svg" "^2.0.1" + +"@parcel/core@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/core/-/core-2.0.1.tgz#804a68fc1768dc9b02ea309e919ca6bb3c6bf175" + integrity sha512-Iy5FgUAquc5HjQGiyKbWK0WaaVXerrzWD7cNBTIUOlk1xNeUtOeGu80Kc5xu0qT0/Mc+nsDfPhWcN8p4RVF+PQ== + dependencies: + "@parcel/cache" "^2.0.1" + "@parcel/diagnostic" "^2.0.1" + "@parcel/events" "^2.0.1" + "@parcel/fs" "^2.0.1" + "@parcel/graph" "^2.0.1" + "@parcel/hash" "^2.0.1" + "@parcel/logger" "^2.0.1" + "@parcel/package-manager" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + "@parcel/workers" "^2.0.1" + abortcontroller-polyfill "^1.1.9" + base-x "^3.0.8" + browserslist "^4.6.6" + clone "^2.1.1" + dotenv "^7.0.0" + dotenv-expand "^5.1.0" + json-source-map "^0.6.1" + json5 "^1.0.1" + micromatch "^4.0.2" + nullthrows "^1.1.1" + semver "^5.4.1" + +"@parcel/diagnostic@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.0.1.tgz#cc96d94eab0db963f0c4586a2f5bc822eea46e36" + integrity sha512-pC9GmEUUB2UQ9epvE/H2wn0rb6hyF68QlpxppHZ9fxib/RxqGWDG1I3axR0cxZifRRZiMNnbk7HfmUB19KNTtA== + dependencies: + json-source-map "^0.6.1" + nullthrows "^1.1.1" + +"@parcel/events@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.0.1.tgz#24ffa93353ca63889faac0928b4118ff1774add5" + integrity sha512-JRt5SkFS8/8r37o1DRKVtrWR1OZNN2pL548YsXVKBLN1b2ys36/+yKNObDuGB7DcOcIRngVs7xxv6+oodGyMlQ== + +"@parcel/fs-search@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.0.1.tgz#673f3ff2725c4557672d453be3f2dcfd4909f80e" + integrity sha512-Zyo1PY4opLMunes5YZ2+Q0cMCgdAuepznVvUY+dK3WjW5OzO09G/L8cfNBhgeYA84wu0yyzNohZogvFjS10TZg== + dependencies: + detect-libc "^1.0.3" + +"@parcel/fs-write-stream-atomic@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/fs-write-stream-atomic/-/fs-write-stream-atomic-2.0.1.tgz#700f9f2b3761494af305e71a185117e804b1ae41" + integrity sha512-+CSeXRCnI9f9K4jeBOYzZiOf+qw6t3TvhEstR/zeXenzx0nBMzPv28mjUMZ33vRMy8bQOHAim8qy/AMSIMolEg== + dependencies: + graceful-fs "^4.1.2" + iferr "^1.0.2" + imurmurhash "^0.1.4" + readable-stream "1 || 2" + +"@parcel/fs@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.0.1.tgz#908fe8c953f8fb8fb9d61d97733b11f8a150fe19" + integrity sha512-zl8aV9Qp4lB4cQGyBfz3LQM+JkL7WHGoSlj8PjBamT8VmPlr57BUtp3Gc/IvRCCX8B7izNx3X8vCvr5BrziL+g== + dependencies: + "@parcel/fs-search" "^2.0.1" + "@parcel/fs-write-stream-atomic" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + "@parcel/watcher" "^2.0.0" + "@parcel/workers" "^2.0.1" + graceful-fs "^4.2.4" + mkdirp "^0.5.1" + ncp "^2.0.0" + nullthrows "^1.1.1" + rimraf "^3.0.2" + utility-types "^3.10.0" + +"@parcel/graph@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/graph/-/graph-2.0.1.tgz#800d9d93ea4a1403954ae913096eba4ea96d66b1" + integrity sha512-LESQVWy/Oln1CqTgWTjvm99btNSqHxOcIKEIL7k6Pq2d6vhO6oyAAmMe5sqf6Sr1nNCVjZW7oHRzyIG0kYTgWw== + dependencies: + nullthrows "^1.1.1" + +"@parcel/hash@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.0.1.tgz#46178908dd4c8c3a3f9f46ae62ec0646100400da" + integrity sha512-Zng4i5HhcmOr6NMzQlnCf12ED9isL+HmcFC3XSLc6VYFcCnVg6cEIwJ7KrB/s5wRHLU2TfSZAaLIJlhcPKPPog== + dependencies: + detect-libc "^1.0.3" + xxhash-wasm "^0.4.1" + +"@parcel/logger@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.0.1.tgz#e379fc171d3b7860bacf363132a983665f01752d" + integrity sha512-gN2mdDnUkbN11hUIDBU+zlREsgp7zm42ZAsc0xwIdmlnsZY7wu2G3lNtkXSMlIPJPdRi6oE6vmaArQJfXjaAOg== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/events" "^2.0.1" + +"@parcel/markdown-ansi@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.0.1.tgz#448eeb7a8d7cc44de4b0d7e74b4ae5b613d5ca30" + integrity sha512-KFUvJoGncCwOml+RSyJl0KfQgle42YC8VJwQrHUqKMR5acyC3KaDNWAx96xkPf3k/hKv+VVEhIsH7SRJ63qwwQ== + dependencies: + chalk "^4.1.0" + +"@parcel/namer-default@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/namer-default/-/namer-default-2.0.1.tgz#94181e72fbb4dd6963d92292e2ba76caca989563" + integrity sha512-wF948WojfksHutz023T2lC3b1BWRyOa9KaCh9caYtZ1Lq26kG3X2eaWVjOzw65SUQRLzAAxu3ujRhKEg0N0Ntw== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + nullthrows "^1.1.1" + +"@parcel/node-libs-browser@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/node-libs-browser/-/node-libs-browser-2.0.1.tgz#4c4c7ae43d7d347bba1f426a9cc01e74bb6bcfce" + integrity sha512-EK6hndQMtW0DJMU4FeDmbDwdIus/IAXz/YjR2kdQ0fLRAvcNWC/34R5bqlLmWdX2NXWVS+1tcDhPa2oEnUzzHA== + dependencies: + assert "^2.0.0" + browserify-zlib "^0.2.0" + buffer "^5.5.0" + console-browserify "^1.2.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.12.0" + domain-browser "^3.5.0" + events "^3.1.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" + path-browserify "^1.0.0" + process "^0.11.10" + punycode "^1.4.1" + querystring-es3 "^0.2.1" + stream-browserify "^3.0.0" + stream-http "^3.1.0" + string_decoder "^1.3.0" + timers-browserify "^2.0.11" + tty-browserify "^0.0.1" + url "^0.11.0" + util "^0.12.3" + vm-browserify "^1.1.2" + +"@parcel/node-resolver-core@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/node-resolver-core/-/node-resolver-core-2.0.1.tgz#1469ad7fe19a48453dfa8c574356fa543cfa8d63" + integrity sha512-bZqot9TZKuBpojo9i4LQ/mc+iKKuurcWDy481E/Z9Xp3zfDEZaNzj2f+0MSwv3pbqB134/PIMMtN92tewJ7Piw== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/node-libs-browser" "^2.0.1" + "@parcel/utils" "^2.0.1" + micromatch "^4.0.4" + nullthrows "^1.1.1" + +"@parcel/optimizer-cssnano@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.0.1.tgz#0b35d2228d372607c591cf73cd7129f886667de5" + integrity sha512-yhuSUyTa4IKsFX+k2K8J6fsClpIWAu0Ng6HcW/fwDSfssZMm+Lfe33+sRo1fwqr8vd/okFrm3vOBQ+NhncsVVw== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + cssnano "^5.0.5" + postcss "^8.3.0" + +"@parcel/optimizer-htmlnano@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.0.1.tgz#6789ebc8140f04a31929a5f7e106cd594afd5771" + integrity sha512-Q2YQt4YnRNGth6RtRw6Q/IanhboKhD2QfrDpUsDwcpBbP3nEirvLcOmVfzuNXDqvYaQG7720ulCRt8jWErZ2WQ== + dependencies: + "@parcel/plugin" "^2.0.1" + htmlnano "^1.0.1" + nullthrows "^1.1.1" + posthtml "^0.16.5" + svgo "^2.4.0" + +"@parcel/optimizer-image@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-image/-/optimizer-image-2.0.1.tgz#39e6551723573bf04f74dcaa1c3a6092e37049f1" + integrity sha512-tXqrAoFoGT6R2nY88OMj6DxHctyewOA3RW6VFksolX+/eWjy9MsQMUWFJmc1TlsVJCu4xGVvcHM3+6Q3XF8VSA== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + detect-libc "^1.0.3" + +"@parcel/optimizer-svgo@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-svgo/-/optimizer-svgo-2.0.1.tgz#66372245677d6e6086cc9ae71bf657c282677b92" + integrity sha512-vdTXQrYjNd7s9ye8NYi7IrcS/oa1Rn1cI9pFeQCocEuL3eoesnFBtkeW0bbA7tNaIBkkR0x9NagRVtWgZJW4uQ== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + svgo "^2.4.0" + +"@parcel/optimizer-terser@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-terser/-/optimizer-terser-2.0.1.tgz#c8375fad84668f4c24d3aef9e2452566e8f5ebab" + integrity sha512-iT3gvkZsUKW4PJHRwWn4xqQlIIsrkr4gO2X5XQtPEXkYUn3UlHTE1lguJd1Pj6L3A0dS+ubI6wIfYk/Z59WAjw== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + terser "^5.2.0" + +"@parcel/package-manager@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.0.1.tgz#98e83b0893d59a2212d859ed95cb93a7710ff92a" + integrity sha512-I8pMP18zIAYIfwnFOhi4Pt+6grKysMxFqNTXAdfobszk4PvoOzbUIjzTk+3Z2IXT2FEdH/R/3Jej70OxpPf0CQ== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/fs" "^2.0.1" + "@parcel/logger" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + "@parcel/workers" "^2.0.1" + command-exists "^1.2.6" + cross-spawn "^6.0.4" + nullthrows "^1.1.1" + semver "^5.4.1" + split2 "^3.1.1" + +"@parcel/packager-css@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/packager-css/-/packager-css-2.0.1.tgz#4e891cd36200c83d2d2c09448a21646309eae1e7" + integrity sha512-oPyouH+6+by3s68xxwYaaePPtrcRhNJ1Tia51eIVagBxp3kAOpB7F4S1Ou8w2qlipk9Wq6HJx2n1u4aZISbkAg== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + postcss "^8.3.0" + +"@parcel/packager-html@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/packager-html/-/packager-html-2.0.1.tgz#d62ffe14d7adfad916ebac8ed9f3776457c2c1ed" + integrity sha512-uGQYjspjz/VF4v+kVWAmPfXoGKCmos8rgTZ7XtXnhuRT4SH/OYHlRKVxzC4sb4zRoeO6Bj82yVw65Xj2gz9K4Q== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + posthtml "^0.16.5" + +"@parcel/packager-js@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/packager-js/-/packager-js-2.0.1.tgz#f6bb5a93d15f08fbf3fdd35974b954a5e722dcc6" + integrity sha512-eN7BQITwTj2KeYMkW/9KRMBw1SoR7qlFhfX2+hbFA6Kl/b0bKEx33Gm21JJBl8wqqo3QVr9Rhg0JruwkQX1JHg== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/hash" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + globals "^13.2.0" + nullthrows "^1.1.1" + +"@parcel/packager-raw@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/packager-raw/-/packager-raw-2.0.1.tgz#08516692e6050debc540fab4b36b078edb8ce492" + integrity sha512-Cr9we+Pf9jl9AhKsZPKg7Da6xzNFxUqPDBRIZmO9GjTm1NZOeddmRPrtporPPZxtTmtQzRuyStRNKe5zBZtg3w== + dependencies: + "@parcel/plugin" "^2.0.1" + +"@parcel/packager-svg@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/packager-svg/-/packager-svg-2.0.1.tgz#0e9fbbd385f848bff1226eb6e29d459ee25a1fa7" + integrity sha512-UqMYNxoaxLdJN+R3rOAACeMdkT/ONcMNQ+OzEowpt6lWZJyLRRF63akk2KhMVjYNQpV6y4wJZV6H/TWV6eRMjg== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + posthtml "^0.16.4" + +"@parcel/plugin@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.0.1.tgz#de6dad81a98e135dad724b581c209332480c70fc" + integrity sha512-zg9LdUk1fh8UApo9q79ZbG+QCwMioSlBP0+LKYLQqcNketzmjPuhe3rCialR0s2/6QsM1EQbuMUpCmZLSQZ4tA== + dependencies: + "@parcel/types" "^2.0.1" + +"@parcel/reporter-cli@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/reporter-cli/-/reporter-cli-2.0.1.tgz#75406cb9d32130891f8c367112d92eb49a8dd453" + integrity sha512-R4gmEhXH6vQMoSEobVolyCIJWBRV9z9Ju5y4gheUv7X0u3e2tpsHpDq835o8jqNIBG75Dm8Q5f3EE8BdhPzTEg== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + chalk "^4.1.0" + filesize "^6.1.0" + nullthrows "^1.1.1" + ora "^5.2.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + term-size "^2.2.1" + wrap-ansi "^7.0.0" + +"@parcel/reporter-dev-server@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/reporter-dev-server/-/reporter-dev-server-2.0.1.tgz#a122645277d20da94d5fc54d92d9b5ffc8801703" + integrity sha512-dm2zgE8mPgLD5Nkmw9WQENZunrBN29fDRkNZhqnQyq4BBXF7e6Q/J/uamUjdtxAp7Qzobw1ZjybqlFuEh0z2tg== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + connect "^3.7.0" + ejs "^3.1.6" + http-proxy-middleware "^1.0.0" + nullthrows "^1.1.1" + serve-handler "^6.0.0" + ws "^7.0.0" + +"@parcel/resolver-default@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/resolver-default/-/resolver-default-2.0.1.tgz#8f6b428f0d65d2f897aad233d2f22ae8f8478e04" + integrity sha512-8+dMgb6pJGaepGAb+44ORLamFv8Ik7T1MyyexI3d9KfWXolU4lhSoFrNGeSEqm4VtPHH0xMYQo2cyIYKZSzuyA== + dependencies: + "@parcel/node-resolver-core" "^2.0.1" + "@parcel/plugin" "^2.0.1" + +"@parcel/runtime-browser-hmr@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.0.1.tgz#f825bcd143b3cf5414c99d2b6f0cffd5e7abe9d0" + integrity sha512-fHuK3tzfJdDhCuNab7aB0RGrfyPlpmV7l0YJJ6Hvv2FiJ1EP2f0mMYF3/T6BXacL4/HLVo58K/XLYhTb6jU2cA== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + +"@parcel/runtime-js@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/runtime-js/-/runtime-js-2.0.1.tgz#cb9c00e3b6e6d16ff38dec4378b01c2b8308ad17" + integrity sha512-5syJTEWY4uw+GH8AYwL55fqRgcBjL/tb95FSYHfABKMHSkaU6KbeUzCv88oj2wE5szWHX793LuqjppO465XYvQ== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + +"@parcel/runtime-react-refresh@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.0.1.tgz#71b8aefa48aa909e8d0ab966f2fe9c9dcecfd53e" + integrity sha512-7j8cmIaoGP0etC2SLrWO1RdxQp+IealRAyZsLODRU22EQxCobGh5uq7Bjdv+m1wZrAdolR00lZe5p+dGrD2QGw== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + react-refresh "^0.9.0" + +"@parcel/runtime-service-worker@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/runtime-service-worker/-/runtime-service-worker-2.0.1.tgz#ef8c6ee8f0b039635a80b36a76ceb9c1d6d8a45d" + integrity sha512-B12lgz5LYLhhvjnTryg38R0PryAbq1+GCJE8Inidzr/IYLROUZANokPcUYUxwVB6QJVzYRhkx3lEf9VziAot2g== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + +"@parcel/source-map@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@parcel/source-map/-/source-map-2.0.0.tgz#41cf004109bbf277ceaf096a58838ff6a59af774" + integrity sha512-njoUJpj2646NebfHp5zKJeYD1KwhsfQIoU9TnCTHmF9fGOaPbClmeq12G6/4ZqGASftRq+YhhukFBi/ncWKGvw== + dependencies: + detect-libc "^1.0.3" + globby "^11.0.3" + +"@parcel/transformer-babel@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-babel/-/transformer-babel-2.0.1.tgz#f7c288e02ade16b7744dc04279b45016680b6787" + integrity sha512-TUCTdZi3V7z0WzyFPe3A1dQ0kLxPS8bEa0KgW7sueo9D0LXFvxpwh3Mf93q2H56KGb96o/QOXkz4HY8og+Wy4g== + dependencies: + "@babel/core" "^7.12.0" + "@babel/generator" "^7.9.0" + "@babel/helper-compilation-targets" "^7.8.4" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/traverse" "^7.0.0" + "@parcel/babel-ast-utils" "^2.0.1" + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + browserslist "^4.6.6" + core-js "^3.2.1" + json5 "^2.1.0" + nullthrows "^1.1.1" + semver "^5.7.0" + +"@parcel/transformer-css@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-css/-/transformer-css-2.0.1.tgz#1eef65fb10b27288281d1bc4f9a23a9d470b546a" + integrity sha512-sSe8elt3ejTkmZmGk3ahhimGwVoxQL0hUYSjmsgK24a4kUoJWby2hvV8BEZWDZ8zJz5ZOWUw+34fM1frEn87dQ== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + postcss "^8.3.0" + postcss-value-parser "^4.1.0" + semver "^5.4.1" + +"@parcel/transformer-html@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-html/-/transformer-html-2.0.1.tgz#f285e46ab654e32bdb8af506284ecb22a14b6547" + integrity sha512-UkRtBHPnuedSX5UPzrZDzNb5pxWCVqvE5/xTPlxWEtN4een9Aixl4RSOZiJxMp4dxxVtw/fo9Lnx0z1wYxbWRw== + dependencies: + "@parcel/hash" "^2.0.1" + "@parcel/plugin" "^2.0.1" + nullthrows "^1.1.1" + posthtml "^0.16.5" + posthtml-parser "^0.10.1" + posthtml-render "^3.0.0" + semver "^5.4.1" + +"@parcel/transformer-image@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-image/-/transformer-image-2.0.1.tgz#b13eb2a54546059a7ab260153e4009a3df5808f9" + integrity sha512-1xHPdE4W8jzsI0AWi4XWYioG2sDZvxJHprlTYNGK8GE+A2U7bOi7T2aoa44fEfK1pRa+N5GTkoNVTYiv4hza0g== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/workers" "^2.0.1" + nullthrows "^1.1.1" + +"@parcel/transformer-js@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-js/-/transformer-js-2.0.1.tgz#784247a16a772fb250dd752a18d7b45e65e78ed4" + integrity sha512-c55qVfPU+jKoFFLV2GhME7CCqBO4Il34lW1EEv0RdYlBivPQQf+8vdcrrRX2FSjlI9cpvw9E4l298HyQDpVyng== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/utils" "^2.0.1" + "@swc/helpers" "^0.2.11" + browserslist "^4.6.6" + detect-libc "^1.0.3" + micromatch "^4.0.2" + nullthrows "^1.1.1" + regenerator-runtime "^0.13.7" + semver "^5.4.1" + +"@parcel/transformer-json@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-json/-/transformer-json-2.0.1.tgz#e33298f3b44d3e6d5067d572ec723c8f806d8c08" + integrity sha512-Nx22PQY5InJdqLKppC+Rq0zwH7mpE2MUvgdyhGBzbwB3qwo+us1uupj+3TGYtBQ8tsUypTZVQ1kWGyQkkGWqHg== + dependencies: + "@parcel/plugin" "^2.0.1" + json5 "^2.1.0" + +"@parcel/transformer-postcss@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-postcss/-/transformer-postcss-2.0.1.tgz#517929aa81523051c1ae1c555ae036c4e0cf6d40" + integrity sha512-bSmOl1CxE5VD7FoNMz9G5ndh3vkYMJl84nbY2t91lUtGcY/ROJ1LKvZrglCCEEE13j9orFsPproQgCcYG7m1eA== + dependencies: + "@parcel/hash" "^2.0.1" + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + clone "^2.1.1" + css-modules-loader-core "^1.1.0" + nullthrows "^1.1.1" + postcss-modules "^3.2.2" + postcss-value-parser "^4.1.0" + semver "^5.4.1" + +"@parcel/transformer-posthtml@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-posthtml/-/transformer-posthtml-2.0.1.tgz#14a25be291d4b9d56abecd0af6ff0dbe97a27ea0" + integrity sha512-UKGZO5vAZCxnTDF5fT8DzNrUdzahpCnFCrFOa0MFKi0DLKrVrxXmgIgLtoLS+mgwd3WuOW3Vx3KgyVovP5n2JQ== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + nullthrows "^1.1.1" + posthtml "^0.16.5" + posthtml-parser "^0.10.1" + posthtml-render "^3.0.0" + semver "^5.4.1" + +"@parcel/transformer-raw@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-raw/-/transformer-raw-2.0.1.tgz#bec9f802cfbda864281056eca88bd8202ff9167c" + integrity sha512-NkwOp2lZX5bNxSj6tMNTEledWZvpIperCMOERm4raToDkdjBH1pDrxDLUBy8VzQ8M08CLz+2KJaF5wRMvj/eQw== + dependencies: + "@parcel/plugin" "^2.0.1" + +"@parcel/transformer-react-refresh-wrap@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.0.1.tgz#4f8c6df15c23e66a61c430615baaf57b5a7791bc" + integrity sha512-zZj2Leh39ODh3C2xDh3eVvp1VnfVqeY5PrNdIcNfWw2DMBli13azcwYmF4Uim8natRqMFIsWsfKNesEY+mGLfA== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/utils" "^2.0.1" + react-refresh "^0.9.0" + +"@parcel/transformer-sass@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-sass/-/transformer-sass-2.0.1.tgz#5bbd7b5de1278224e42a6c013d934e4ceb19a4b8" + integrity sha512-Qk4+8N1zNaBxXRqjJvzjLjutuuhyw/3MHSA6wjvY5BqQB22GtDFE8h9KFSFN7hPdU8CEiBntKe1diqeckPCg4w== + dependencies: + "@parcel/plugin" "^2.0.1" + "@parcel/source-map" "^2.0.0" + sass "^1.38.0" + +"@parcel/transformer-svg@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-svg/-/transformer-svg-2.0.1.tgz#acee4bbb9b4a9f1a80416180630da5123a8fd452" + integrity sha512-ZctnwpSomOZoh2FdfETLU4WnIr2t5P9W7QX5USATTlq62uD404Qsj1gr93wQgjLjzy9ID6T1Ua4iIdYNSkScNA== + dependencies: + "@parcel/hash" "^2.0.1" + "@parcel/plugin" "^2.0.1" + nullthrows "^1.1.1" + posthtml "^0.16.5" + posthtml-parser "^0.10.1" + posthtml-render "^3.0.0" + semver "^5.4.1" + +"@parcel/types@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.0.1.tgz#e4f30f29e0f1ea53029a0450794a3d0aee90a9f7" + integrity sha512-em8/GgC7uzkUyEA2ogkzeVDmjaKYQhjf/4EIiC7jXWr22NlSXRQOawhc0CB2o97J9EV2rVXVkWTj0drHTpN2Bw== + dependencies: + "@parcel/cache" "^2.0.1" + "@parcel/diagnostic" "^2.0.1" + "@parcel/fs" "^2.0.1" + "@parcel/package-manager" "^2.0.1" + "@parcel/source-map" "^2.0.0" + "@parcel/workers" "^2.0.1" + utility-types "^3.10.0" + +"@parcel/utils@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.0.1.tgz#dd78bfe3562abd2bf3b4f8417758e4e0dbd8350f" + integrity sha512-+XD+LYDq+VKAUfRPzcsOjq9LefeX6tiQ2zH2uCWYAwA+s+sTHIrvWkKoF3QfFOQpPgj2QqnAZMOS6F/xY2phPg== + dependencies: + "@iarna/toml" "^2.2.0" + "@parcel/codeframe" "^2.0.1" + "@parcel/diagnostic" "^2.0.1" + "@parcel/hash" "^2.0.1" + "@parcel/logger" "^2.0.1" + "@parcel/markdown-ansi" "^2.0.1" + "@parcel/source-map" "^2.0.0" + ansi-html-community "0.0.8" + chalk "^4.1.0" + clone "^2.1.1" + fast-glob "3.1.1" + fastest-levenshtein "^1.0.8" + is-glob "^4.0.0" + is-url "^1.2.2" + json5 "^1.0.1" + lru-cache "^6.0.0" + micromatch "^4.0.4" + node-forge "^0.10.0" + nullthrows "^1.1.1" + open "^7.0.3" + terminal-link "^2.1.1" + +"@parcel/watcher@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.1.tgz#ec4bb6c43d9588a1ffd3d2abe6df5b501463c62d" + integrity sha512-XegFF4L8sFn1RzU5KKOZxXUuzgOSwd6+X2ez3Cy6MVhYMbiLZ1moceMTqDhuT3N8DNbdumK3zP1wojsIsnX40w== + dependencies: + node-addon-api "^3.2.1" + node-gyp-build "^4.3.0" + +"@parcel/workers@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.0.1.tgz#55e540556b201677591519b26f84c6ec955b9a6c" + integrity sha512-nBBK5QeoWM0l8khyStDiEd432UXaF6mkUa8n2D4Ee6XOFgUCiXWV7VROqA4nhf6OJr5K+trtNaNVGq9oHRuPHw== + dependencies: + "@parcel/diagnostic" "^2.0.1" + "@parcel/logger" "^2.0.1" + "@parcel/types" "^2.0.1" + "@parcel/utils" "^2.0.1" + chrome-trace-event "^1.0.2" + nullthrows "^1.1.1" + +"@swc/helpers@^0.2.11": + version "0.2.13" + resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.2.13.tgz#95d69aaed0998040d455832efbe1342ed79d0809" + integrity sha512-HxfZHtTgDlME7fH+KIwBrm1B1+2iB3UpbcSbPCZzDAHxZ3z+qfjflHverm33sXrdyQYx4s3J7r6ot76433mwEg== + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + +"@types/chroma-js@^2.0.0": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.1.3.tgz#0b03d737ff28fad10eb884e0c6cedd5ffdc4ba0a" + integrity sha512-1xGPhoSGY1CPmXLCBcjVZSQinFjL26vlR8ZqprsBWiFyED4JacJJ9zHhh5aaUXqbY9B37mKQ73nlydVAXmr1+g== + +"@types/hast@^2.0.0": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" + integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== + dependencies: + "@types/unist" "*" + +"@types/hoist-non-react-statics@^3.3.0": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + +"@types/http-proxy@^1.17.5": + version "1.17.7" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" + integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w== + dependencies: + "@types/node" "*" + +"@types/lodash@^4.14.160": + version "4.14.176" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0" + integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ== + +"@types/mdast@^3.0.0": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" + integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== + dependencies: + "@types/unist" "*" + +"@types/node@*": + version "16.11.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" + integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + +"@types/numeral@^0.0.28": + version "0.0.28" + resolved "https://registry.yarnpkg.com/@types/numeral/-/numeral-0.0.28.tgz#e43928f0bda10b169b6f7ecf99e3ddf836b8ebe4" + integrity sha512-Sjsy10w6XFHDktJJdXzBJmoondAKW+LcGpRFH+9+zXEDj0cOH8BxJuZA9vUDSMAzU1YRJlsPKmZEEiTYDlICLw== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/parse5@^5.0.0": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" + integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== + +"@types/prismjs@*": + version "1.16.6" + resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.6.tgz#377054f72f671b36dbe78c517ce2b279d83ecc40" + integrity sha512-dTvnamRITNqNkqhlBd235kZl3KfVJQQoT5jkXeiWSBK7i4/TLKBNLV0S1wOt8gy4E2TY722KLtdmv2xc6+Wevg== + +"@types/prop-types@*": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + +"@types/react-beautiful-dnd@^13.0.0": + version "13.1.2" + resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.2.tgz#510405abb09f493afdfd898bf83995dc6385c130" + integrity sha512-+OvPkB8CdE/bGdXKyIhc/Lm2U7UAYCCJgsqmopFmh9gbAudmslkI8eOrPDjg4JhwSE6wytz4a3/wRjKtovHVJg== + dependencies: + "@types/react" "*" + +"@types/react-input-autosize@^2.2.0": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@types/react-input-autosize/-/react-input-autosize-2.2.1.tgz#6a335212e7fce1e1a4da56ae2095c8c5c35fbfe6" + integrity sha512-RxzEjd4gbLAAdLQ92Q68/AC+TfsAKTc4evsArUH1aIShIMqQMIMjsxoSnwyjtbFTO/AGIW/RQI94XSdvOxCz/w== + dependencies: + "@types/react" "*" + +"@types/react-redux@^7.1.20": + version "7.1.20" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.20.tgz#42f0e61ababb621e12c66c96dda94c58423bd7df" + integrity sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + +"@types/react-virtualized-auto-sizer@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.1.tgz#b3187dae1dfc4c15880c9cfc5b45f2719ea6ebd4" + integrity sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong== + dependencies: + "@types/react" "*" + +"@types/react-window@^1.8.2": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz#285fcc5cea703eef78d90f499e1457e9b5c02fc1" + integrity sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw== + dependencies: + "@types/react" "*" + +"@types/react@*": + version "17.0.34" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.34.tgz#797b66d359b692e3f19991b6b07e4b0c706c0102" + integrity sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/refractor@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/refractor/-/refractor-3.0.2.tgz#2d42128d59f78f84d2c799ffc5ab5cadbcba2d82" + integrity sha512-2HMXuwGuOqzUG+KUTm9GDJCHl0LCBKsB5cg28ujEmVi/0qgTb6jOmkVSO5K48qXksyl2Fr3C0Q2VrgD4zbwyXg== + dependencies: + "@types/prismjs" "*" + +"@types/resize-observer-browser@^0.1.5": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz#d8e6c2f830e2650dc06fe74464472ff64b54a302" + integrity sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg== + +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + +"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== + +"@types/vfile-message@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5" + integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw== + dependencies: + vfile-message "*" + +abab@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + +abortcontroller-polyfill@^1.1.9: + version "1.7.3" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5" + integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q== + +acorn-globals@^4.3.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== + dependencies: + acorn "^6.0.1" + acorn-walk "^6.0.1" + +acorn-walk@^6.0.1: + version "6.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" + integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== + +acorn@^6.0.1, acorn@^6.0.4: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + +ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +alphanum-sort@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + +ansi-escapes@^4.2.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-html-community@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aria-hidden@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.3.tgz#bb48de18dc84787a3c6eee113709c473c64ec254" + integrity sha512-RhVWFtKH5BiGMycI72q2RAFMLQi8JP9bLuQXgR5a8Znp7P5KOIADSJeyfI8PCVxLEp067B2HbP5JIiI/PXIZeA== + dependencies: + tslib "^1.0.0" + +array-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" + integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" + +asn1@~0.2.3: + version "0.2.6" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" + integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assert@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32" + integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A== + dependencies: + es6-object-assign "^1.1.0" + is-nan "^1.2.1" + object-is "^1.0.1" + util "^0.12.0" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +astring@^1.6.2: + version "1.7.5" + resolved "https://registry.yarnpkg.com/astring/-/astring-1.7.5.tgz#a7d47fceaf32b052d33a3d07c511efeec67447ca" + integrity sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA== + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +attr-accept@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" + integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== + +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +bail@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base-x@^3.0.8: + version "3.0.9" + resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320" + integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ== + dependencies: + safe-buffer "^5.0.1" + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bl@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +bn.js@^5.0.0, bn.js@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== + +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +brace@^0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" + integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg= + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +brorand@^1.0.1, brorand@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +browserify-cipher@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" + integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" + integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + dependencies: + bn.js "^5.0.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== + dependencies: + pako "~1.0.5" + +browserslist@^4.0.0, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.6.6: + version "4.17.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.6.tgz#c76be33e7786b497f66cad25a73756c8b938985d" + integrity sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw== + dependencies: + caniuse-lite "^1.0.30001274" + electron-to-chromium "^1.3.886" + escalade "^3.1.1" + node-releases "^2.0.1" + picocolors "^1.0.0" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== + dependencies: + browserslist "^4.0.0" + caniuse-lite "^1.0.0" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001274: + version "1.0.30001278" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz#51cafc858df77d966b17f59b5839250b24417fff" + integrity sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +ccount@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" + integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg== + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +character-entities-html4@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125" + integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g== + +character-entities-legacy@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== + +character-entities@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== + +character-reference-invalid@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== + +"chokidar@>=3.0.0 <4.0.0": + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chroma-js@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.2.tgz#1075cb9ae25bcb2017c109394168b5cf3aa500ec" + integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ== + dependencies: + cross-env "^6.0.3" + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +classnames@^2.2.6, classnames@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-spinners@^2.5.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + +collapse-white-space@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ== + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colord@^2.9.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" + integrity sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw== + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +comma-separated-tokens@^1.0.0: + version "1.0.8" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" + integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== + +command-exists@^1.2.6: + version "1.2.9" + resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" + integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + +commander@^7.0.0, commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concurrently@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.3.0.tgz#63128cb4a6ed54d3c0ed8528728590a5fe54582a" + integrity sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw== + dependencies: + chalk "^4.1.0" + date-fns "^2.16.1" + lodash "^4.17.21" + rxjs "^6.6.3" + spawn-command "^0.0.2-1" + supports-color "^8.1.0" + tree-kill "^1.2.2" + yargs "^16.2.0" + +connect@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== + dependencies: + debug "2.6.9" + finalhandler "1.1.2" + parseurl "~1.3.3" + utils-merge "1.0.1" + +console-browserify@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== + +constants-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + +content-disposition@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= + +convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +core-js@^3.2.1: + version "3.19.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.1.tgz#f6f173cae23e73a7d88fa23b6e9da329276c6641" + integrity sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg== + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +create-ecdh@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== + dependencies: + bn.js "^4.1.0" + elliptic "^6.5.3" + +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-env@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" + integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== + dependencies: + cross-spawn "^7.0.0" + +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^6.0.4: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-browserify@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + randomfill "^1.0.3" + +css-box-model@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1" + integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw== + dependencies: + tiny-invariant "^1.0.6" + +css-color-names@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" + integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== + +css-declaration-sorter@^6.0.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== + dependencies: + timsort "^0.3.0" + +css-modules-loader-core@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16" + integrity sha1-WQhmgpShvs0mGuCkziGwtVHyHRY= + dependencies: + icss-replace-symbols "1.1.0" + postcss "6.0.1" + postcss-modules-extract-imports "1.1.0" + postcss-modules-local-by-default "1.2.0" + postcss-modules-scope "1.1.0" + postcss-modules-values "1.3.0" + +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + +css-selector-tokenizer@^0.7.0: + version "0.7.3" + resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1" + integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg== + dependencies: + cssesc "^3.0.0" + fastparse "^1.1.2" + +css-tree@^1.1.2, css-tree@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +css-what@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssnano-preset-default@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.5.tgz#6effb7175ee5d296f95330e137587e27ee974d44" + integrity sha512-fF00UI+d3PWkGfMd62geqmoUe5h+LOhGE2GH4Fqq3beNKdCU1LWwLUyIcu4/A72lWv0737cHey5zhhWw3rW0sA== + dependencies: + css-declaration-sorter "^6.0.3" + cssnano-utils "^2.0.1" + postcss-calc "^8.0.0" + postcss-colormin "^5.2.1" + postcss-convert-values "^5.0.2" + postcss-discard-comments "^5.0.1" + postcss-discard-duplicates "^5.0.1" + postcss-discard-empty "^5.0.1" + postcss-discard-overridden "^5.0.1" + postcss-merge-longhand "^5.0.2" + postcss-merge-rules "^5.0.2" + postcss-minify-font-values "^5.0.1" + postcss-minify-gradients "^5.0.3" + postcss-minify-params "^5.0.1" + postcss-minify-selectors "^5.1.0" + postcss-normalize-charset "^5.0.1" + postcss-normalize-display-values "^5.0.1" + postcss-normalize-positions "^5.0.1" + postcss-normalize-repeat-style "^5.0.1" + postcss-normalize-string "^5.0.1" + postcss-normalize-timing-functions "^5.0.1" + postcss-normalize-unicode "^5.0.1" + postcss-normalize-url "^5.0.2" + postcss-normalize-whitespace "^5.0.1" + postcss-ordered-values "^5.0.2" + postcss-reduce-initial "^5.0.1" + postcss-reduce-transforms "^5.0.1" + postcss-svgo "^5.0.3" + postcss-unique-selectors "^5.0.1" + +cssnano-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" + integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== + +cssnano@^5.0.5, cssnano@^5.0.8: + version "5.0.9" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.9.tgz#bd03168835c0883c16754085704f57861a32d99c" + integrity sha512-Y4olTKBKsPKl5izpcXHRDiB/1rVdbIDM4qVXgEKBt466kYT42SEEsnCYOQFFXzEkUYV8pJNCII9JKzb8KfDk+g== + dependencies: + cssnano-preset-default "^5.1.5" + is-resolvable "^1.1.0" + lilconfig "^2.0.3" + yaml "^1.10.2" + +csso@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== + dependencies: + css-tree "^1.1.2" + +cssom@0.3.x, cssom@^0.3.4: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^1.1.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" + integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA== + dependencies: + cssom "0.3.x" + +csstype@^3.0.2: + version "3.0.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" + integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +data-urls@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" + integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== + dependencies: + abab "^2.0.0" + whatwg-mimetype "^2.2.0" + whatwg-url "^7.0.0" + +date-fns@^2.16.1: + version "2.25.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.25.0.tgz#8c5c8f1d958be3809a9a03f4b742eba894fc5680" + integrity sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4.1.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +des.js@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +detect-node-es@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493" + integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ== + +diff-match-patch@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37" + integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw== + +diffie-hellman@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dom-serializer@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domain-browser@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-3.5.0.tgz#3a11f5df52fd9d60d7f1c79a62fde2d158c42b09" + integrity sha512-zrzUu6auyZWRexjCEPJnfWc30Hupxh2lJZOJAF3qa2bCuD4O/55t0FvQt3ZMhEw++gjNkwdkOVZh8yA32w/Vfw== + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domexception@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" + integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug== + dependencies: + webidl-conversions "^4.0.2" + +domhandler@^4.2.0, domhandler@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== + dependencies: + domelementtype "^2.2.0" + +domutils@^2.6.0, domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c" + integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +ejs@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + dependencies: + jake "^10.6.1" + +electron-to-chromium@^1.3.886: + version "1.3.889" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.889.tgz#0b7c6f7628559592d5406deda281788f37107790" + integrity sha512-suEUoPTD1mExjL9TdmH7cvEiWJVM2oEiAi+Y1p0QKxI2HcRlT44qDTP2c1aZmVwRemIPYOpxmV7CxQCOWcm4XQ== + +elliptic@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== + dependencies: + bn.js "^4.11.9" + brorand "^1.1.0" + hash.js "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +emoticon@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg== + +emphasize@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/emphasize/-/emphasize-4.2.0.tgz#6b6fdc4d212cb7eafea1c7cdd595dfd6cfc508d9" + integrity sha512-yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg== + dependencies: + chalk "^4.0.0" + highlight.js "~10.4.0" + lowlight "~1.17.0" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" + integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.18.5: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.1" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escodegen@^1.11.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.1.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +extend@^3.0.0, extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82" + integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + +fast-glob@^3.1.1: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-url-parser@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= + dependencies: + punycode "^1.3.2" + +fastest-levenshtein@^1.0.8: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastparse@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" + integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== + +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + +fault@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13" + integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA== + dependencies: + format "^0.2.0" + +file-selector@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80" + integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA== + dependencies: + tslib "^2.0.3" + +filelist@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + dependencies: + minimatch "^3.0.4" + +filesize@^6.1.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" + integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ== + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +focus-lock@^0.9.1: + version "0.9.2" + resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.2.tgz#9d30918aaa99b1b97677731053d017f82a540d5b" + integrity sha512-YtHxjX7a0IC0ZACL5wsX8QdncXofWpGPNoVMuI/nZUrPGp6LmNI6+D5j0pPj+v8Kw5EpweA+T5yImK0rnWf7oQ== + dependencies: + tslib "^2.0.3" + +follow-redirects@^1.0.0: + version "1.14.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" + integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +format@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" + integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +generic-names@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872" + integrity sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ== + dependencies: + loader-utils "^1.1.0" + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-nonce@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3" + integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q== + +get-port@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119" + integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw== + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.0.0, glob@^7.1.3, glob@^7.1.4: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^13.2.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" + integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.2.4: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== + dependencies: + inherits "^2.0.3" + minimalistic-assert "^1.0.1" + +hast-to-hyperscript@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" + integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA== + dependencies: + "@types/unist" "^2.0.3" + comma-separated-tokens "^1.0.0" + property-information "^5.3.0" + space-separated-tokens "^1.0.0" + style-to-object "^0.3.0" + unist-util-is "^4.0.0" + web-namespaces "^1.0.0" + +hast-util-from-parse5@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + integrity sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA== + dependencies: + "@types/parse5" "^5.0.0" + hastscript "^6.0.0" + property-information "^5.0.0" + vfile "^4.0.0" + vfile-location "^3.2.0" + web-namespaces "^1.0.0" + +hast-util-is-element@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425" + integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ== + +hast-util-parse-selector@^2.0.0: + version "2.2.5" + resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a" + integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ== + +hast-util-raw@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.1.0.tgz#e16a3c2642f65cc7c480c165400a40d604ab75d0" + integrity sha512-5FoZLDHBpka20OlZZ4I/+RBw5piVQ8iI1doEvffQhx5CbCyTtP8UCq8Tw6NmTAMtXgsQxmhW7Ly8OdFre5/YMQ== + dependencies: + "@types/hast" "^2.0.0" + hast-util-from-parse5 "^6.0.0" + hast-util-to-parse5 "^6.0.0" + html-void-elements "^1.0.0" + parse5 "^6.0.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + vfile "^4.0.0" + web-namespaces "^1.0.0" + xtend "^4.0.0" + zwitch "^1.0.0" + +hast-util-to-html@^7.1.1: + version "7.1.3" + resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz#9f339ca9bea71246e565fc79ff7dbfe98bb50f5e" + integrity sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw== + dependencies: + ccount "^1.0.0" + comma-separated-tokens "^1.0.0" + hast-util-is-element "^1.0.0" + hast-util-whitespace "^1.0.0" + html-void-elements "^1.0.0" + property-information "^5.0.0" + space-separated-tokens "^1.0.0" + stringify-entities "^3.0.1" + unist-util-is "^4.0.0" + xtend "^4.0.0" + +hast-util-to-parse5@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479" + integrity sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ== + dependencies: + hast-to-hyperscript "^9.0.0" + property-information "^5.0.0" + web-namespaces "^1.0.0" + xtend "^4.0.0" + zwitch "^1.0.0" + +hast-util-whitespace@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41" + integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A== + +hastscript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + integrity sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w== + dependencies: + "@types/hast" "^2.0.0" + comma-separated-tokens "^1.0.0" + hast-util-parse-selector "^2.0.0" + property-information "^5.0.0" + space-separated-tokens "^1.0.0" + +highlight.js@~10.4.0: + version "10.4.1" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0" + integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg== + +hmac-drbg@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + +hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + +html-encoding-sniffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" + integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== + dependencies: + whatwg-encoding "^1.0.1" + +html-tags@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.2.0.tgz#c78de65b5663aa597989dd2b7ab49200d7e4db98" + integrity sha1-x43mW1Zjqll5id0rerSSANfk25g= + +html-void-elements@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" + integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w== + +htmlnano@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/htmlnano/-/htmlnano-1.1.1.tgz#aea50e1d7ac156370ea766d4cd75f2d3d1a953cc" + integrity sha512-diMNyqTPx4uGwlxrTs0beZCy8L/GxGIFGHWv20OYhthLcdYkDOP/d4Ja5MbGgVJZMakZUM21KpMk5qWZrBGSdw== + dependencies: + cosmiconfig "^7.0.1" + cssnano "^5.0.8" + postcss "^8.3.6" + posthtml "^0.16.5" + purgecss "^4.0.0" + relateurl "^0.2.7" + srcset "^4.0.0" + svgo "^2.6.1" + terser "^5.8.0" + timsort "^0.3.0" + uncss "^0.17.3" + +htmlparser2@^7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.1.2.tgz#587923d38f03bc89e03076e00cba2c7473f37f7c" + integrity sha512-d6cqsbJba2nRdg8WW2okyD4ceonFHn9jLFxhwlNcLhQWcFPdxXeJulgOLjLKtAK9T6ahd+GQNZwG9fjmGW7lyg== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.2" + domutils "^2.8.0" + entities "^3.0.1" + +http-proxy-middleware@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665" + integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg== + dependencies: + "@types/http-proxy" "^1.17.5" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" + integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= + +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +iferr@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/iferr/-/iferr-1.0.2.tgz#e9fde49a9da06dc4a4194c6c9ed6d08305037a6d" + integrity sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg== + +ignore@^5.1.4: + version "5.1.9" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== + +import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inline-style-parser@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" + integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +is-absolute-url@^3.0.1, is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== + +is-alphabetical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" + integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== + +is-alphanumerical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + +is-arguments@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-buffer@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== + +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-decimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-function@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-hexadecimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== + +is-html@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-html/-/is-html-1.1.0.tgz#e04f1c18d39485111396f9a0273eab51af218464" + integrity sha1-4E8cGNOUhRETlvmgJz6rUa8hhGQ= + dependencies: + html-tags "^1.0.0" + +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-json@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-json/-/is-json-2.0.1.tgz#6be166d144828a131d686891b983df62c39491ff" + integrity sha1-a+Fm0USCihMdaGiRuYPfYsOUkf8= + +is-nan@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" + integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + +is-number-object@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-resolvable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-typed-array@^1.1.3, is-typed-array@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79" + integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-abstract "^1.18.5" + foreach "^2.0.5" + has-tostringtag "^1.0.0" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + +is-url@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" + integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== + +is-weakref@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" + integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + dependencies: + call-bind "^1.0.0" + +is-whitespace-character@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" + integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w== + +is-word-character@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA== + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsdom@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-14.1.0.tgz#916463b6094956b0a6c1782c94e380cd30e1981b" + integrity sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng== + dependencies: + abab "^2.0.0" + acorn "^6.0.4" + acorn-globals "^4.3.0" + array-equal "^1.0.0" + cssom "^0.3.4" + cssstyle "^1.1.1" + data-urls "^1.1.0" + domexception "^1.0.1" + escodegen "^1.11.0" + html-encoding-sniffer "^1.0.2" + nwsapi "^2.1.3" + parse5 "5.1.0" + pn "^1.1.0" + request "^2.88.0" + request-promise-native "^1.0.5" + saxes "^3.1.9" + symbol-tree "^3.2.2" + tough-cookie "^2.5.0" + w3c-hr-time "^1.0.1" + w3c-xmlserializer "^1.1.2" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^7.0.0" + ws "^6.1.2" + xml-name-validator "^3.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/json-source-map/-/json-source-map-0.6.1.tgz#e0b1f6f4ce13a9ad57e2ae165a24d06e62c79a0f" + integrity sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg== + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + +json5@^2.1.0, json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lilconfig@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" + integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +lmdb-store@^1.5.5: + version "1.6.12" + resolved "https://registry.yarnpkg.com/lmdb-store/-/lmdb-store-1.6.12.tgz#95edc584992b558632a95ad82dc429be89dcabe9" + integrity sha512-zFQS4J0dmMamAH+oF1keWS7MlYW4rjX3+qsYvpZu5jU9AR2vSRnzMRFrc/R94uwOkyMptR7hT2fzqaQ/DcrDeg== + dependencies: + nan "^2.14.2" + node-gyp-build "^4.2.3" + ordered-binary "^1.0.0" + weak-lru-cache "^1.0.0" + optionalDependencies: + msgpackr "^1.4.7" + +loader-utils@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.clone@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" + integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= + +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lowlight@~1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.17.0.tgz#a1143b2fba8239df8cd5893f9fe97aaf8465af4a" + integrity sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ== + dependencies: + fault "^1.0.0" + highlight.js "~10.4.0" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +markdown-escapes@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +mdast-util-definitions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" + integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ== + dependencies: + unist-util-visit "^2.0.0" + +mdast-util-to-hast@^10.0.0, mdast-util-to-hast@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604" + integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ== + dependencies: + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + mdast-util-definitions "^4.0.0" + mdurl "^1.0.0" + unist-builder "^2.0.0" + unist-util-generated "^1.0.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdurl@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= + +"memoize-one@>=3.1.1 <6", memoize-one@^5.1.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +miller-rabin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +mime-db@1.50.0: + version "1.50.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" + integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== + +mime-db@~1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ== + +mime-types@2.1.18: + version "2.1.18" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ== + dependencies: + mime-db "~1.33.0" + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.33" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" + integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== + dependencies: + mime-db "1.50.0" + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + +minimatch@3.0.4, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +msgpackr-extract@^1.0.14: + version "1.0.15" + resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-1.0.15.tgz#3010a3ff0b033782d525116071b6c32864a79db2" + integrity sha512-vgJgzFva0/4/mt84wXf3CRCDPHKqiqk5t7/kVSjk/V2IvwSjoStHhxyq/b2+VrWcch3sxiNQOJEWXgI86Fm7AQ== + dependencies: + nan "^2.14.2" + node-gyp-build "^4.2.3" + +msgpackr@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.4.7.tgz#d802ade841e7d2e873000b491cdda6574a3d5748" + integrity sha512-bhC8Ed1au3L3oHaR/fe4lk4w7PLGFcWQ5XY/Tk9N6tzDRz8YndjCG68TD8zcvYZoxNtw767eF/7VpaTpU9kf9w== + optionalDependencies: + msgpackr-extract "^1.0.14" + +nan@^2.14.2: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + +nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + +ncp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-addon-api@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-emoji@^1.10.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== + dependencies: + lodash "^4.17.21" + +node-forge@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== + +node-gyp-build@^4.2.3, node-gyp-build@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + +node-releases@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + +nth-check@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== + dependencies: + boolbase "^1.0.0" + +nullthrows@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" + integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== + +numeral@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506" + integrity sha1-StCAk21EPCVhrtnyGX7//iX05QY= + +nwsapi@^2.1.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + +object-is@^1.0.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +open@^7.0.3: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +ora@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + +ordered-binary@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.1.3.tgz#11dbc0a4cb7f8248183b9845e031b443be82571e" + integrity sha512-tDTls+KllrZKJrqRXUYJtIcWIyoQycP7cVN7kzNNnhHKF2bMKHflcAQK+pF2Eb1iVaQodHxqZQr0yv4HWLGBhQ== + +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + +pako@~1.0.5: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + +parcel@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/parcel/-/parcel-2.0.1.tgz#ec3f86259cef21ff9db4bcc56bc28518a0c14f0d" + integrity sha512-tGc7p3CbltlxYiu5u8NmFc2T5G3JZQDbKjlxDtjDpsNvLS6twX0Wu/D/HufaUKXyZr7O9JV7by3E+6DIo5cr5Q== + dependencies: + "@parcel/config-default" "^2.0.1" + "@parcel/core" "^2.0.1" + "@parcel/diagnostic" "^2.0.1" + "@parcel/events" "^2.0.1" + "@parcel/fs" "^2.0.1" + "@parcel/logger" "^2.0.1" + "@parcel/package-manager" "^2.0.1" + "@parcel/reporter-cli" "^2.0.1" + "@parcel/reporter-dev-server" "^2.0.1" + "@parcel/utils" "^2.0.1" + chalk "^4.1.0" + commander "^7.0.0" + get-port "^4.2.0" + v8-compile-cache "^2.0.0" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== + dependencies: + asn1.js "^5.2.0" + browserify-aes "^1.0.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" + +parse-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== + +parse5@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-browserify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-is-inside@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + +path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-to-regexp@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ== + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pbkdf2@^3.0.3: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picocolors@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== + +postcss-calc@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== + dependencies: + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + +postcss-colormin@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" + integrity sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA== + dependencies: + browserslist "^4.16.6" + caniuse-api "^3.0.0" + colord "^2.9.1" + postcss-value-parser "^4.1.0" + +postcss-convert-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + integrity sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-discard-comments@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== + +postcss-discard-duplicates@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== + +postcss-discard-empty@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== + +postcss-discard-overridden@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== + +postcss-merge-longhand@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" + integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== + dependencies: + css-color-names "^1.0.1" + postcss-value-parser "^4.1.0" + stylehacks "^5.0.1" + +postcss-merge-rules@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" + integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== + dependencies: + browserslist "^4.16.6" + caniuse-api "^3.0.0" + cssnano-utils "^2.0.1" + postcss-selector-parser "^6.0.5" + vendors "^1.0.3" + +postcss-minify-font-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-minify-gradients@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" + integrity sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q== + dependencies: + colord "^2.9.1" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-minify-params@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" + integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== + dependencies: + alphanum-sort "^1.0.2" + browserslist "^4.16.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + uniqs "^2.0.0" + +postcss-minify-selectors@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== + dependencies: + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" + +postcss-modules-extract-imports@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" + integrity sha1-thTJcgvmgW6u41+zpfqh26agXds= + dependencies: + postcss "^6.0.1" + +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== + dependencies: + postcss "^7.0.5" + +postcss-modules-local-by-default@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" + integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= + dependencies: + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" + +postcss-modules-local-by-default@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" + integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= + dependencies: + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" + +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" + +postcss-modules-values@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" + integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= + dependencies: + icss-replace-symbols "^1.1.0" + postcss "^6.0.1" + +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + dependencies: + icss-utils "^4.0.0" + postcss "^7.0.6" + +postcss-modules@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.2.tgz#ee390de0f9f18e761e1778dfb9be26685c02c51f" + integrity sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw== + dependencies: + generic-names "^2.0.1" + icss-replace-symbols "^1.1.0" + lodash.camelcase "^4.3.0" + postcss "^7.0.32" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" + string-hash "^1.1.1" + +postcss-normalize-charset@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== + +postcss-normalize-display-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-positions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" + integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-normalize-repeat-style@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-string@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-normalize-timing-functions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-unicode@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== + dependencies: + browserslist "^4.16.0" + postcss-value-parser "^4.1.0" + +postcss-normalize-url@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" + integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== + dependencies: + is-absolute-url "^3.0.3" + normalize-url "^6.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-whitespace@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-ordered-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-reduce-initial@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" + integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== + dependencies: + browserslist "^4.16.0" + caniuse-api "^3.0.0" + +postcss-reduce-transforms@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-selector-parser@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-svgo@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + integrity sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA== + dependencies: + postcss-value-parser "^4.1.0" + svgo "^2.7.0" + +postcss-unique-selectors@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" + integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== + dependencies: + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" + uniqs "^2.0.0" + +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" + integrity sha1-AA29H47vIXqjaLmiEsX8QLKo8/I= + dependencies: + chalk "^1.1.3" + source-map "^0.5.6" + supports-color "^3.2.3" + +postcss@^6.0.1: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + +postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.39" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + +postcss@^8.2.1, postcss@^8.3.0, postcss@^8.3.6: + version "8.3.11" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" + integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== + dependencies: + nanoid "^3.1.30" + picocolors "^1.0.0" + source-map-js "^0.6.2" + +posthtml-parser@^0.10.0, posthtml-parser@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.1.tgz#63c41931a9339cc2c32aba14f06286d98f107abf" + integrity sha512-i7w2QEHqiGtsvNNPty0Mt/+ERch7wkgnFh3+JnBI2VgDbGlBqKW9eDVd3ENUhE1ujGFe3e3E/odf7eKhvLUyDg== + dependencies: + htmlparser2 "^7.1.1" + +posthtml-render@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-3.0.0.tgz#97be44931496f495b4f07b99e903cc70ad6a3205" + integrity sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA== + dependencies: + is-json "^2.0.1" + +posthtml@^0.16.4, posthtml@^0.16.5: + version "0.16.5" + resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.16.5.tgz#d32f5cf32436516d49e0884b2367d0a1424136f6" + integrity sha512-1qOuPsywVlvymhTFIBniDXwUDwvlDri5KUQuBqjmCc8Jj4b/HDSVWU//P6rTWke5rzrk+vj7mms2w8e1vD0nnw== + dependencies: + posthtml-parser "^0.10.0" + posthtml-render "^3.0.0" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prismjs@~1.25.0: + version "1.25.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" + integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + +property-information@^5.0.0, property-information@^5.3.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" + integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA== + dependencies: + xtend "^4.0.0" + +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +public-encrypt@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" + integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + safe-buffer "^5.1.2" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^1.3.2, punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +purgecss@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz#8147b429f9c09db719e05d64908ea8b672913742" + integrity sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw== + dependencies: + commander "^6.0.0" + glob "^7.0.0" + postcss "^8.2.1" + postcss-selector-parser "^6.0.2" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +querystring-es3@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +raf-schd@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a" + integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ== + +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +randomfill@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + +range-parser@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= + +react-ace@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-7.0.5.tgz#798299fd52ddf3a3dcc92afc5865538463544f01" + integrity sha512-3iI+Rg2bZXCn9K984ll2OF4u9SGcJH96Q1KsUgs9v4M2WePS4YeEHfW2nrxuqJrAkE5kZbxaCE79k6kqK0YBjg== + dependencies: + brace "^0.11.1" + diff-match-patch "^1.0.4" + lodash.get "^4.4.2" + lodash.isequal "^4.5.0" + prop-types "^15.7.2" + +react-beautiful-dnd@^13.0.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d" + integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA== + dependencies: + "@babel/runtime" "^7.9.2" + css-box-model "^1.2.0" + memoize-one "^5.1.1" + raf-schd "^4.0.2" + react-redux "^7.2.0" + redux "^4.0.4" + use-memo-one "^1.1.1" + +react-clientside-effect@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.5.tgz#e2c4dc3c9ee109f642fac4f5b6e9bf5bcd2219a3" + integrity sha512-2bL8qFW1TGBHozGGbVeyvnggRpMjibeZM2536AKNENLECutp2yfs44IL8Hmpn8qjFQ2K7A9PnYf3vc7aQq/cPA== + dependencies: + "@babel/runtime" "^7.12.13" + +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react-dropzone@^11.2.0: + version "11.4.2" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.4.2.tgz#1eb99e9def4cc7520f4f58e85c853ce52c483d56" + integrity sha512-ocYzYn7Qgp0tFc1gQtUTOaHHSzVTwhWHxxY+r7cj2jJTPfMTZB5GWSJHdIVoxsl+EQENpjJ/6Zvcw0BqKZQ+Eg== + dependencies: + attr-accept "^2.2.1" + file-selector "^0.2.2" + prop-types "^15.7.2" + +react-focus-lock@^2.5.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.2.tgz#f1e4db5e25cd8789351f2bd5ebe91e9dcb9c2922" + integrity sha512-WzpdOnEqjf+/A3EH9opMZWauag7gV0BxFl+EY4ElA4qFqYsUsBLnmo2sELbN5OC30S16GAWMy16B9DLPpdJKAQ== + dependencies: + "@babel/runtime" "^7.0.0" + focus-lock "^0.9.1" + prop-types "^15.6.2" + react-clientside-effect "^1.2.5" + use-callback-ref "^1.2.5" + use-sidecar "^1.0.5" + +react-focus-on@^3.5.0: + version "3.5.2" + resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.5.2.tgz#65cd20e05d8b38248ddc95998780037aff6b4b2b" + integrity sha512-tpPxLqw9tEuElWmcr5jqw/ULfJjdHEnom0nBW9p6y75Zsa0wOfwQNqCHqCoJcHUqSBtKXqTuYduZoSTfTOTdJw== + dependencies: + aria-hidden "^1.1.2" + react-focus-lock "^2.5.0" + react-remove-scroll "^2.4.1" + react-style-singleton "^2.1.1" + use-callback-ref "^1.2.5" + use-sidecar "^1.0.5" + +react-input-autosize@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2" + integrity sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw== + dependencies: + prop-types "^15.5.8" + +react-is@^16.7.0, react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-is@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +react-is@~16.3.0: + version "16.3.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22" + integrity sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q== + +react-redux@^7.2.0: + version "7.2.6" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa" + integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ== + dependencies: + "@babel/runtime" "^7.15.4" + "@types/react-redux" "^7.1.20" + hoist-non-react-statics "^3.3.2" + loose-envify "^1.4.0" + prop-types "^15.7.2" + react-is "^17.0.2" + +react-refresh@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf" + integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ== + +react-remove-scroll-bar@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.2.0.tgz#d4d545a7df024f75d67e151499a6ab5ac97c8cdd" + integrity sha512-UU9ZBP1wdMR8qoUs7owiVcpaPwsQxUDC2lypP6mmixaGlARZa7ZIBx1jcuObLdhMOvCsnZcvetOho0wzPa9PYg== + dependencies: + react-style-singleton "^2.1.0" + tslib "^1.0.0" + +react-remove-scroll@^2.4.1: + version "2.4.3" + resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.3.tgz#83d19b02503b04bd8141ed6e0b9e6691a2e935a6" + integrity sha512-lGWYXfV6jykJwbFpsuPdexKKzp96f3RbvGapDSIdcyGvHb7/eqyn46C7/6h+rUzYar1j5mdU+XECITHXCKBk9Q== + dependencies: + react-remove-scroll-bar "^2.1.0" + react-style-singleton "^2.1.0" + tslib "^1.0.0" + use-callback-ref "^1.2.3" + use-sidecar "^1.0.1" + +react-style-singleton@^2.1.0, react-style-singleton@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.1.1.tgz#ce7f90b67618be2b6b94902a30aaea152ce52e66" + integrity sha512-jNRp07Jza6CBqdRKNgGhT3u9umWvils1xsuMOjZlghBDH2MU0PL2WZor4PGYjXpnRCa9DQSlHMs/xnABWOwYbA== + dependencies: + get-nonce "^1.0.0" + invariant "^2.2.4" + tslib "^1.0.0" + +react-virtualized-auto-sizer@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca" + integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ== + +react-window@^1.8.5: + version "1.8.6" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112" + integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one ">=3.1.1 <6" + +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +"readable-stream@1 || 2": + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.0, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +redux@^4.0.0, redux@^4.0.4: + version "4.1.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104" + integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw== + dependencies: + "@babel/runtime" "^7.9.2" + +refractor@^3.4.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz#334586f352dda4beaf354099b48c2d18e0819aec" + integrity sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg== + dependencies: + hastscript "^6.0.0" + parse-entities "^2.0.0" + prismjs "~1.25.0" + +regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== + +rehype-raw@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.1.0.tgz#66d5e8d7188ada2d31bc137bc19a1000cf2c6b7e" + integrity sha512-MDvHAb/5mUnif2R+0IPCYJU8WjHa9UzGtM/F4AVy5GixPlDZ1z3HacYy4xojDU+uBa+0X/3PIfyQI26/2ljJNA== + dependencies: + hast-util-raw "^6.1.0" + +rehype-react@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/rehype-react/-/rehype-react-6.2.1.tgz#9b9bf188451ad6f63796b784fe1f51165c67b73a" + integrity sha512-f9KIrjktvLvmbGc7si25HepocOg4z0MuNOtweigKzBcDjiGSTGhyz6VSgaV5K421Cq1O+z4/oxRJ5G9owo0KVg== + dependencies: + "@mapbox/hast-util-table-cell-style" "^0.2.0" + hast-to-hyperscript "^9.0.0" + +rehype-stringify@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-8.0.0.tgz#9b6afb599bcf3165f10f93fc8548f9a03d2ec2ba" + integrity sha512-VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g== + dependencies: + hast-util-to-html "^7.1.1" + +relateurl@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + +remark-emoji@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== + dependencies: + emoticon "^3.2.0" + node-emoji "^1.10.0" + unist-util-visit "^2.0.3" + +remark-parse@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q== + dependencies: + ccount "^1.0.0" + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^2.0.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^2.0.0" + vfile-location "^3.0.0" + xtend "^4.0.1" + +remark-rehype@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945" + integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA== + dependencies: + mdast-util-to-hast "^10.2.0" + +repeat-string@^1.5.4: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + +request-promise-native@^1.0.5: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== + dependencies: + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + +request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rxjs@^6.6.3: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sass@^1.38.0: + version "1.43.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.4.tgz#68c7d6a1b004bef49af0d9caf750e9b252105d1f" + integrity sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg== + dependencies: + chokidar ">=3.0.0 <4.0.0" + +saxes@^3.1.9: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +semver@^5.4.1, semver@^5.5.0, semver@^5.7.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +serve-handler@^6.0.0: + version "6.1.3" + resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" + integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w== + dependencies: + bytes "3.0.0" + content-disposition "0.5.2" + fast-url-parser "1.1.3" + mime-types "2.1.18" + minimatch "3.0.4" + path-is-inside "1.0.2" + path-to-regexp "2.2.1" + range-parser "1.2.0" + +setimmediate@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.2: + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + +source-map-support@~0.5.20: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.5.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.2: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +space-separated-tokens@^1.0.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" + integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== + +spawn-command@^0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= + +split2@^3.1.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + +srcset@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/srcset/-/srcset-4.0.0.tgz#336816b665b14cd013ba545b6fe62357f86e65f4" + integrity sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw== + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + +state-toggle@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== + +statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stealthy-require@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + +stream-browserify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" + integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== + dependencies: + inherits "~2.0.4" + readable-stream "^3.5.0" + +stream-http@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.4" + readable-stream "^3.6.0" + xtend "^4.0.2" + +string-hash@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" + integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.1.1, string_decoder@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +stringify-entities@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903" + integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg== + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + xtend "^4.0.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +style-to-object@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== + dependencies: + inline-style-parser "0.1.1" + +stylehacks@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== + dependencies: + browserslist "^4.16.0" + postcss-selector-parser "^6.0.4" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= + dependencies: + has-flag "^1.0.0" + +supports-color@^5.3.0, supports-color@^5.4.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + +svgo@^2.4.0, svgo@^2.6.1, svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" + picocolors "^1.0.0" + stable "^0.1.8" + +symbol-tree@^3.2.2: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +tabbable@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-3.1.2.tgz#f2d16cccd01f400e38635c7181adfe0ad965a4a2" + integrity sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ== + +term-size@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" + integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== + +terminal-link@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + +terser@^5.2.0, terser@^5.8.0, terser@^5.9.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" + integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.20" + +text-diff@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/text-diff/-/text-diff-1.0.1.tgz#6c105905435e337857375c9d2f6ca63e453ff565" + integrity sha1-bBBZBUNeM3hXN1ydL2ymPkU/9WU= + +timers-browserify@^2.0.11: + version "2.0.12" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" + integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== + dependencies: + setimmediate "^1.0.4" + +timsort@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + +tiny-invariant@^1.0.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tough-cookie@^2.3.3, tough-cookie@^2.5.0, tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= + dependencies: + punycode "^2.1.0" + +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + +trim-trailing-lines@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== + +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + +trough@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== + +tslib@^1.0.0, tslib@^1.9.0, tslib@^1.9.3: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.0.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + +tty-browserify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" + integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + +uncss@^0.17.3: + version "0.17.3" + resolved "https://registry.yarnpkg.com/uncss/-/uncss-0.17.3.tgz#50fc1eb4ed573ffff763458d801cd86e4d69ea11" + integrity sha512-ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog== + dependencies: + commander "^2.20.0" + glob "^7.1.4" + is-absolute-url "^3.0.1" + is-html "^1.1.0" + jsdom "^14.1.0" + lodash "^4.17.15" + postcss "^7.0.17" + postcss-selector-parser "6.0.2" + request "^2.88.0" + +unherit@^1.0.4: + version "1.1.3" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ== + dependencies: + inherits "^2.0.0" + xtend "^4.0.0" + +unified@^9.2.0: + version "9.2.2" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975" + integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.0.0" + +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= + +uniqs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" + integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= + +unist-builder@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw== + +unist-util-generated@^1.0.0: + version "1.1.6" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== + +unist-util-is@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd" + integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== + +unist-util-is@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" + integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== + +unist-util-position@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== + +unist-util-remove-position@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA== + dependencies: + unist-util-visit "^2.0.0" + +unist-util-stringify-position@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== + dependencies: + "@types/unist" "^2.0.2" + +unist-util-stringify-position@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9" + integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA== + dependencies: + "@types/unist" "^2.0.0" + +unist-util-visit-parents@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9" + integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g== + dependencies: + unist-util-is "^3.0.0" + +unist-util-visit-parents@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + +unist-util-visit@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3" + integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw== + dependencies: + unist-util-visit-parents "^2.0.0" + +unist-util-visit@^2.0.0, unist-util-visit@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + +unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +use-callback-ref@^1.2.3, use-callback-ref@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5" + integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg== + +use-memo-one@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20" + integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ== + +use-sidecar@^1.0.1, use-sidecar@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b" + integrity sha512-k9jnrjYNwN6xYLj1iaGhonDghfvmeTmYjAiGvOr7clwKfPjMXJf4/HOr7oT5tJwYafgp2tG2l3eZEOfoELiMcA== + dependencies: + detect-node-es "^1.1.0" + tslib "^1.9.3" + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util@^0.12.0, util@^0.12.3: + version "0.12.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" + integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + safe-buffer "^5.1.2" + which-typed-array "^1.1.2" + +utility-types@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" + integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg== + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8-compile-cache@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +vendors@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vfile-location@^3.0.0, vfile-location@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" + integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== + +vfile-message@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.2.tgz#db7eaebe7fecb853010f2ef1664427f52baf8f74" + integrity sha512-UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^3.0.0" + +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + +vfile@^4.0.0, vfile@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + +vm-browserify@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== + +w3c-hr-time@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" + integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== + dependencies: + domexception "^1.0.1" + webidl-conversions "^4.0.2" + xml-name-validator "^3.0.0" + +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + dependencies: + defaults "^1.0.3" + +weak-lru-cache@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.1.3.tgz#8a691884501b611d2b5aeac1ee5a011b2a97d9a8" + integrity sha512-5LDIv+sr6uzT94Hhcq7Qv7gt3jxol4iMWUqOgJSLYbB5oO7bTSMqIBtKsytm8N2BufYOdJw86/qu+SDfbo/wKQ== + +web-namespaces@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" + integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== + +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== + +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-typed-array@^1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793" + integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-abstract "^1.18.5" + foreach "^2.0.5" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.7" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^6.1.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== + dependencies: + async-limiter "~1.0.0" + +ws@^7.0.0: + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +xxhash-wasm@^0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz#752398c131a4dd407b5132ba62ad372029be6f79" + integrity sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0, yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +zwitch@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== diff --git a/redisinsight/ui/src/packages/redisearch/src/App.tsx b/redisinsight/ui/src/packages/redisearch/src/App.tsx index 14e491330f..868aa15c02 100644 --- a/redisinsight/ui/src/packages/redisearch/src/App.tsx +++ b/redisinsight/ui/src/packages/redisearch/src/App.tsx @@ -13,8 +13,7 @@ import { TableInfoResult, TableResult } from './components' interface Props { command: string, - response: any, - status: string + result?: { response: any, status: string }[] } // This is problematic for some bundlers and/or deployments, @@ -22,7 +21,7 @@ interface Props { appendIconComponentCache(cachedIcons) const App = (props: Props) => { - const { command = '', response = [], status = '' } = props + const { command = '', result: [{ response = '', status = '' } = {}] = [] } = props if (status === 'fail') { return
{response}
diff --git a/redisinsight/ui/src/packages/redisearch/src/main.tsx b/redisinsight/ui/src/packages/redisearch/src/main.tsx index 1628aa5374..20eef2f49c 100644 --- a/redisinsight/ui/src/packages/redisearch/src/main.tsx +++ b/redisinsight/ui/src/packages/redisearch/src/main.tsx @@ -1,20 +1,19 @@ /* eslint-disable react/jsx-filename-extension */ import React from 'react' import { render } from 'react-dom' -// import response from './response.json' -// import response from './responseInfo.json' -import response from './response3.json' +import result from './result2.json' +// import result from './resultInfo.json' +// import result from './result3.json' import App from './App' interface Props { command?: string - data?: any - status?: string + data?: { response: any, status: string }[] } const renderRediSearch = (props:Props) => { - const { command = '', status = '', data: response = {} } = props - render(, + const { command = '', data: result = [] } = props + render(, document.getElementById('app')) } @@ -22,7 +21,7 @@ if (process.env.NODE_ENV === 'development') { const command = 'ft.search idx' // const command = 'ft.info idx' - renderRediSearch({ command, data: response, status: 'success' }) + renderRediSearch({ command, data: result }) } export default { renderRediSearch } diff --git a/redisinsight/ui/src/packages/redisearch/src/response.json b/redisinsight/ui/src/packages/redisearch/src/response.json deleted file mode 100644 index abd8edd227..0000000000 --- a/redisinsight/ui/src/packages/redisearch/src/response.json +++ /dev/null @@ -1,116 +0,0 @@ -[ - "index_name", - "idx", - "index_options", - [ - - ], - "index_definition", - [ - "key_type", - "HASH", - "prefixes", - [ - "doc:" - ], - "language_field", - "__language", - "default_score", - "0.5", - "score_field", - "doc_score", - "payload_field", - "__payload" - ], - "fields", - [ - [ - "title", - "type", - "TEXT", - "WEIGHT", - "1" - ], - [ - "body", - "type", - "TEXT", - "WEIGHT", - "1" - ], - [ - "url", - "type", - "TEXT", - "WEIGHT", - "1" - ], - [ - "visits", - "type", - "NUMERIC" - ] - ], - "num_docs", - "2", - "max_doc_id", - "2", - "num_terms", - "12", - "num_records", - "22", - "inverted_sz_mb", - "0.0001201629638671875", - "total_inverted_index_blocks", - "40", - "offset_vectors_sz_mb", - "2.288818359375e-05", - "doc_table_size_mb", - "0.0001659393310546875", - "sortable_values_size_mb", - "0", - "key_table_size_mb", - "8.296966552734375e-05", - "records_per_doc_avg", - "11", - "bytes_per_record_avg", - "5.7272725105285645", - "offsets_per_term_avg", - "1.0909091234207153", - "offset_bits_per_record_avg", - "8", - "hash_indexing_failures", - "0", - "indexing", - "0", - "percent_indexed", - "1", - "gc_stats", - [ - "bytes_collected", - "0", - "total_ms_run", - "0", - "total_cycles", - "0", - "average_cycle_time_ms", - "-nan", - "last_run_time_ms", - "0", - "gc_numeric_trees_missed", - "0", - "gc_blocks_denied", - "0" - ], - "cursor_stats", - [ - "global_idle", - 0, - "global_total", - 0, - "index_capacity", - 128, - "index_total", - 0 - ] - ] diff --git a/redisinsight/ui/src/packages/redisearch/src/response2.json b/redisinsight/ui/src/packages/redisearch/src/response2.json deleted file mode 100644 index 3473d90ef1..0000000000 --- a/redisinsight/ui/src/packages/redisearch/src/response2.json +++ /dev/null @@ -1,69 +0,0 @@ -[ - 2, - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:1", - [ - "title", - "Redis", - "body", - "Primary and caching", - "url", - "", - "visits", - "108" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ] - ] diff --git a/redisinsight/ui/src/packages/redisearch/src/response3.json b/redisinsight/ui/src/packages/redisearch/src/response3.json deleted file mode 100644 index 028321a32c..0000000000 --- a/redisinsight/ui/src/packages/redisearch/src/response3.json +++ /dev/null @@ -1,1279 +0,0 @@ -[ - 2, - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:1", - [ - "title", - "Redis", - "body", - "Primary and caching", - "url", - "", - "visits", - "108" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ], - "doc:2", - [ - "title", - "Redis", - "body", - "Modules", - "url", - "", - "visits", - "102" - ] - ] diff --git a/redisinsight/ui/src/packages/redisearch/src/responseInfo.json b/redisinsight/ui/src/packages/redisearch/src/responseInfo.json deleted file mode 100644 index 1e54b088c6..0000000000 --- a/redisinsight/ui/src/packages/redisearch/src/responseInfo.json +++ /dev/null @@ -1,107 +0,0 @@ -[ - "index_name", - "idx2", - "index_options", - [ - - ], - "index_definition", - [ - "key_type", - "HASH", - "prefixes", - [ - "" - ], - "language_field", - "__language", - "default_score", - "1", - "score_field", - "__score", - "payload_field", - "__payload" - ], - "fields", - [ - [ - "name", - "type", - "TEXT", - "WEIGHT", - "1", - "SORTABLE" - ], - [ - "docid", - "type", - "TAG", - "SEPARATOR", - ",", - "SORTABLE", - "NOINDEX" - ] - ], - "num_docs", - "5136", - "max_doc_id", - "5157", - "num_terms", - "6", - "num_records", - "47", - "inverted_sz_mb", - "0.0002689361572265625", - "total_inverted_index_blocks", - "40", - "offset_vectors_sz_mb", - "4.482269287109375e-05", - "doc_table_size_mb", - "0.52691459655761719", - "sortable_values_size_mb", - "0.000782012939453125", - "key_table_size_mb", - "0.19832515716552734", - "records_per_doc_avg", - "0.0091510899364948273", - "bytes_per_record_avg", - "6", - "offsets_per_term_avg", - "1", - "offset_bits_per_record_avg", - "8", - "hash_indexing_failures", - "0", - "indexing", - "0", - "percent_indexed", - "1", - "gc_stats", - [ - "bytes_collected", - "0", - "total_ms_run", - "0", - "total_cycles", - "0", - "average_cycle_time_ms", - "-nan", - "last_run_time_ms", - "0", - "gc_numeric_trees_missed", - "0", - "gc_blocks_denied", - "0" - ], - "cursor_stats", - [ - "global_idle", - 0, - "global_total", - 0, - "index_capacity", - 128, - "index_total", - 0 - ] - ] diff --git a/redisinsight/ui/src/packages/redisearch/src/result.json b/redisinsight/ui/src/packages/redisearch/src/result.json new file mode 100644 index 0000000000..da50209945 --- /dev/null +++ b/redisinsight/ui/src/packages/redisearch/src/result.json @@ -0,0 +1,121 @@ +[ + { + "status": "success", + "response": [ + "index_name", + "idx", + "index_options", + [ + + ], + "index_definition", + [ + "key_type", + "HASH", + "prefixes", + [ + "doc:" + ], + "language_field", + "__language", + "default_score", + "0.5", + "score_field", + "doc_score", + "payload_field", + "__payload" + ], + "fields", + [ + [ + "title", + "type", + "TEXT", + "WEIGHT", + "1" + ], + [ + "body", + "type", + "TEXT", + "WEIGHT", + "1" + ], + [ + "url", + "type", + "TEXT", + "WEIGHT", + "1" + ], + [ + "visits", + "type", + "NUMERIC" + ] + ], + "num_docs", + "2", + "max_doc_id", + "2", + "num_terms", + "12", + "num_records", + "22", + "inverted_sz_mb", + "0.0001201629638671875", + "total_inverted_index_blocks", + "40", + "offset_vectors_sz_mb", + "2.288818359375e-05", + "doc_table_size_mb", + "0.0001659393310546875", + "sortable_values_size_mb", + "0", + "key_table_size_mb", + "8.296966552734375e-05", + "records_per_doc_avg", + "11", + "bytes_per_record_avg", + "5.7272725105285645", + "offsets_per_term_avg", + "1.0909091234207153", + "offset_bits_per_record_avg", + "8", + "hash_indexing_failures", + "0", + "indexing", + "0", + "percent_indexed", + "1", + "gc_stats", + [ + "bytes_collected", + "0", + "total_ms_run", + "0", + "total_cycles", + "0", + "average_cycle_time_ms", + "-nan", + "last_run_time_ms", + "0", + "gc_numeric_trees_missed", + "0", + "gc_blocks_denied", + "0" + ], + "cursor_stats", + [ + "global_idle", + 0, + "global_total", + 0, + "index_capacity", + 128, + "index_total", + 0 + ] + ] + } +] diff --git a/redisinsight/ui/src/packages/redisearch/src/result2.json b/redisinsight/ui/src/packages/redisearch/src/result2.json new file mode 100644 index 0000000000..23e97f3c1d --- /dev/null +++ b/redisinsight/ui/src/packages/redisearch/src/result2.json @@ -0,0 +1,74 @@ +[ + { + "status": "success", + "response": [ + 2, + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:1", + [ + "title", + "Redis", + "body", + "Primary and caching", + "url", + "", + "visits", + "108" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ] + ] + } +] diff --git a/redisinsight/ui/src/packages/redisearch/src/result3.json b/redisinsight/ui/src/packages/redisearch/src/result3.json new file mode 100644 index 0000000000..cb9ec1285c --- /dev/null +++ b/redisinsight/ui/src/packages/redisearch/src/result3.json @@ -0,0 +1,1284 @@ +[ + { + "status": "success", + "response": [ + 2, + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:1", + [ + "title", + "Redis", + "body", + "Primary and caching", + "url", + "", + "visits", + "108" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ], + "doc:2", + [ + "title", + "Redis", + "body", + "Modules", + "url", + "", + "visits", + "102" + ] + ] + } +] diff --git a/redisinsight/ui/src/packages/redisearch/src/resultInfo.json b/redisinsight/ui/src/packages/redisearch/src/resultInfo.json new file mode 100644 index 0000000000..1e89476738 --- /dev/null +++ b/redisinsight/ui/src/packages/redisearch/src/resultInfo.json @@ -0,0 +1,112 @@ +[ + { + "status": "success", + "response": [ + "index_name", + "idx2", + "index_options", + [ + + ], + "index_definition", + [ + "key_type", + "HASH", + "prefixes", + [ + "" + ], + "language_field", + "__language", + "default_score", + "1", + "score_field", + "__score", + "payload_field", + "__payload" + ], + "fields", + [ + [ + "name", + "type", + "TEXT", + "WEIGHT", + "1", + "SORTABLE" + ], + [ + "docid", + "type", + "TAG", + "SEPARATOR", + ",", + "SORTABLE", + "NOINDEX" + ] + ], + "num_docs", + "5136", + "max_doc_id", + "5157", + "num_terms", + "6", + "num_records", + "47", + "inverted_sz_mb", + "0.0002689361572265625", + "total_inverted_index_blocks", + "40", + "offset_vectors_sz_mb", + "4.482269287109375e-05", + "doc_table_size_mb", + "0.52691459655761719", + "sortable_values_size_mb", + "0.000782012939453125", + "key_table_size_mb", + "0.19832515716552734", + "records_per_doc_avg", + "0.0091510899364948273", + "bytes_per_record_avg", + "6", + "offsets_per_term_avg", + "1", + "offset_bits_per_record_avg", + "8", + "hash_indexing_failures", + "0", + "indexing", + "0", + "percent_indexed", + "1", + "gc_stats", + [ + "bytes_collected", + "0", + "total_ms_run", + "0", + "total_cycles", + "0", + "average_cycle_time_ms", + "-nan", + "last_run_time_ms", + "0", + "gc_numeric_trees_missed", + "0", + "gc_blocks_denied", + "0" + ], + "cursor_stats", + [ + "global_idle", + 0, + "global_total", + 0, + "index_capacity", + 128, + "index_total", + 0 + ] + ] + } +] diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceControls/styles.module.scss b/redisinsight/ui/src/pages/home/components/AddInstanceControls/styles.module.scss index 31b4c77ab2..ae8832dcb8 100644 --- a/redisinsight/ui/src/pages/home/components/AddInstanceControls/styles.module.scss +++ b/redisinsight/ui/src/pages/home/components/AddInstanceControls/styles.module.scss @@ -42,18 +42,19 @@ width: 413px; height: 64px; padding-right: 40px; - background: url(../../../../assets/img/NYbg.jpg) center; background-size: cover; - &::before { - content: ''; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - background-color: var(--overlayPromoNYColor); - } + // For future promo implementations + //background: url(../../../../assets/img/NYbg.jpg) center; + //&::before { + // content: ''; + // position: absolute; + // top: 0px; + // right: 0px; + // bottom: 0px; + // left: 0px; + // background-color: var(--overlayPromoNYColor); + //} &:hover { transform: translateY(-1px); @@ -62,14 +63,12 @@ .createTitle { padding-top: 3px; line-height: 16px; - color: #ffffff !important; position: relative; font-weight: 500 !important; } .createText { font-size: 12px !important; - color: #ffffff !important; position: relative; } diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx index 0eab303d5e..c1e278236a 100644 --- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx +++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx @@ -529,7 +529,7 @@ const AddStandaloneForm = (props: Props) => { diff --git a/redisinsight/ui/src/pages/instance/InstancePage.tsx b/redisinsight/ui/src/pages/instance/InstancePage.tsx index d598b5c686..4dcb0e00fc 100644 --- a/redisinsight/ui/src/pages/instance/InstancePage.tsx +++ b/redisinsight/ui/src/pages/instance/InstancePage.tsx @@ -8,17 +8,18 @@ import { fetchInstanceAction, getDatabaseConfigInfoAction, } from 'uiSrc/slices/instances' -import { BrowserStorageItem } from 'uiSrc/constants' -import { localStorageService } from 'uiSrc/services' import { appContextSelector, setAppContextConnectedInstanceId, setAppContextInitialState, } from 'uiSrc/slices/app/context' import { resetKeys } from 'uiSrc/slices/keys' +import { BrowserStorageItem } from 'uiSrc/constants' +import { localStorageService } from 'uiSrc/services' import { resetOutput } from 'uiSrc/slices/cli/cli-output' import { cliSettingsSelector } from 'uiSrc/slices/cli/cli-settings' import BottomGroupComponents from 'uiSrc/components/bottom-group-components/BottomGroupComponents' +import { monitorSelector, setMonitorInitialState } from 'uiSrc/slices/cli/monitor' import InstancePageRouter from './InstancePageRouter' import styles from './styles.module.scss' @@ -30,6 +31,11 @@ export interface Props { export const firstPanelId = 'main-component' export const secondPanelId = 'cli' +export interface ResizablePanelSize { + [firstPanelId]: number + [secondPanelId]: number +} + export const getDefaultSizes = () => { const storedSizes = localStorageService.get(BrowserStorageItem.cliResizableContainer) @@ -42,14 +48,15 @@ export const getDefaultSizes = () => { } const InstancePage = ({ routes = [] }: Props) => { - const [sizes, setSizes] = useState(getDefaultSizes()) + const [sizes, setSizes] = useState(getDefaultSizes()) const dispatch = useDispatch() const { instanceId: connectionInstanceId } = useParams<{ instanceId: string }>() const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector) + const { isShowMonitor } = useSelector(monitorSelector) const { contextInstanceId } = useSelector(appContextSelector) - const isShowBottomGroup = isShowCli || isShowHelper + const isShowBottomGroup = isShowCli || isShowHelper || isShowMonitor useEffect(() => { dispatch(fetchInstanceAction(connectionInstanceId)) @@ -63,7 +70,7 @@ const InstancePage = ({ routes = [] }: Props) => { }, []) useEffect(() => () => { - setSizes((prevSizes: any) => { + setSizes((prevSizes: ResizablePanelSize) => { localStorageService.set(BrowserStorageItem.cliResizableContainer, { [firstPanelId]: prevSizes[firstPanelId], // partially fix elastic resizable issue with zooming @@ -73,6 +80,7 @@ const InstancePage = ({ routes = [] }: Props) => { }, []) const resetContext = () => { + dispatch(setMonitorInitialState()) dispatch(setAppContextInitialState()) dispatch(resetKeys()) setTimeout(() => { diff --git a/redisinsight/ui/src/pages/sentinelDatabases/SentinelDatabasesPage.tsx b/redisinsight/ui/src/pages/sentinelDatabases/SentinelDatabasesPage.tsx index 850ed0532a..676f8926b5 100644 --- a/redisinsight/ui/src/pages/sentinelDatabases/SentinelDatabasesPage.tsx +++ b/redisinsight/ui/src/pages/sentinelDatabases/SentinelDatabasesPage.tsx @@ -246,7 +246,7 @@ const SentinelDatabasesPage = () => { diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/styles.scss b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/styles.scss deleted file mode 100644 index b3168bfbb4..0000000000 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/styles.scss +++ /dev/null @@ -1,115 +0,0 @@ -@mixin font{ - font: normal normal normal 14px/24px Graphik; - letter-spacing: -0.14px; - @media only screen and (max-width: 1440px) { - font: normal normal normal 13px/18px Graphik; - letter-spacing: -0.13px; - } - @media only screen and (max-width: 992px) { - font: normal normal normal 12px/18px Graphik; - letter-spacing: -0.12px; - } -} -$margin-size-pace: 4; - -.enablement-area__page { - padding-bottom: 12px; - height: 100%; - @include font; - letter-spacing: -0.12px; - - h1, h2, h3, h4, h5, h6 { - color: var(--euiColorGhost); - font: normal normal 500 14px/24px Graphik; - margin-bottom: ($margin-size-pace * 3 + px); - margin-top: ($margin-size-pace * 3 + px); - letter-spacing: 0; - } - - hr + h1, hr + h2, hr + h3, hr + h4, hr + h5, hr + h6 { - margin-top: 0; - } - - p { - margin-bottom: 20px; - } - - .mb-s { - margin-bottom: ($margin-size-pace * 3 + px); - } - .mt-s { - margin-top: ($margin-size-pace * 3 + px); - } - - a { - color: var(--euiColorGhost); - text-decoration: underline; - &:focus { - text-decoration: underline; - } - } - b, strong { - @include font; - letter-spacing: -0.12px; - color: var(--htmlColor); - } - hr { - border: none; - height: 1px; - width: 100%; - background-color: var(--separatorColor); - margin: ($margin-size-pace * 3 + px) 0; - } - - code { - display: flex; - padding: 12px; - width: 100%; - background-color: var(--euiColorLightShade); - white-space: pre-wrap; - border-radius: 2px; - } - - b + ul, strong + ul, b + ol, strong + ol { - margin-top: 10px; - } - ul:not(.euiPagination__list) { - list-style-type: disc; - list-style-position: outside; - margin-left: 15px; - li:not(:last-of-type) { - margin-bottom: 5px; - } - ul, ol { - list-style-type: circle; - list-style-position: outside; - margin-left: 15px; - } - } - - ol { - list-style-type: decimal; - list-style-position: outside; - margin-left: 15px; - li:not(:last-of-type) { - margin-bottom: 5px; - } - ol, ul { - list-style-type: circle; - list-style-position: outside; - margin-left: 15px; - } - } - - ul, ol { - + p { - margin-top: ($margin-size-pace * 3 + px); - } - li p { - margin-bottom: 0; - } - } - p + ul, p + ol { - margin-top: -($margin-size-pace * 3 + px); - } -} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts deleted file mode 100644 index b5bfbd85fc..0000000000 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { unified } from 'unified' -import remarkParse from 'remark-parse' -import remarkRehype from 'remark-rehype' -import rehypeStringify from 'rehype-stringify' -import { visit } from 'unist-util-visit' -import { IS_ABSOLUTE_PATH } from 'uiSrc/constants/regex' - -import { IFormatter } from './formatter.interfaces' - -class MarkdownToJsxString implements IFormatter { - format(data: any): Promise { - return new Promise((resolve, reject) => { - unified() - .use(remarkParse) - .use(MarkdownToJsxString.remarkRedisCode) - .use(remarkRehype, { allowDangerousHtml: true }) // Pass raw HTML strings through. - .use(MarkdownToJsxString.rehypeExternalLinks) // Set External links - .use(rehypeStringify, { allowDangerousHtml: true }) // Serialize the raw HTML strings - .process(data) - .then((file) => { - resolve(String(file)) - }) - .catch((error) => reject(error)) - }) - } - - private static remarkRedisCode(): (tree: Node) => void { - return (tree: any) => { - // Find code node in syntax tree - visit(tree, 'code', (codeNode) => { - const { value, meta, lang } = codeNode - // Check that it has a language unsupported by our editor - if (lang === 'redis') { - codeNode.type = 'html' - // Replace it with our custom component - codeNode.value = `{${JSON.stringify(value)}}` - } - }) - } - } - - private static rehypeExternalLinks(): (tree: Node) => void { - return (tree: any) => { - visit(tree, 'element', (node) => { - if (node.tagName === 'a' && node.properties && typeof node.properties.href === 'string') { - const url = node.properties.href - if (IS_ABSOLUTE_PATH.test(url)) { - node.properties.rel = ['nofollow', 'noopener', 'noreferrer'] - node.properties.target = '_blank' - } - } - }) - } - } -} - -export default MarkdownToJsxString diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/formatter.interfaces.ts b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/formatter.interfaces.ts deleted file mode 100644 index f7a692f6ee..0000000000 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/formatter.interfaces.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IFormatter { - format(data: any): Promise; -} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.spec.tsx similarity index 95% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.spec.tsx index d846421de4..c11339536a 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.spec.tsx @@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash' import { instance, mock } from 'ts-mockito' import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils' import { MOCK_ENABLEMENT_AREA_ITEMS } from 'uiSrc/constants' -import { EnablementAreaComponent } from 'uiSrc/slices/interfaces' +import { EnablementAreaComponent, IEnablementAreaItem } from 'uiSrc/slices/interfaces' import EnablementArea, { Props } from './EnablementArea' @@ -57,12 +57,12 @@ describe('EnablementArea', () => { expect(treeViewEl?.childNodes.length).toEqual(Object.values(MOCK_ENABLEMENT_AREA_ITEMS).length) }) it('should render Group component', () => { - const item = { + const item: IEnablementAreaItem = { type: EnablementAreaComponent.Group, id: 'quick-guides', label: 'Quick Guides', - children: [ - { + children: { + document: { type: EnablementAreaComponent.InternalLink, id: 'document-capabilities', label: 'Document Capabilities', @@ -70,7 +70,7 @@ describe('EnablementArea', () => { path: 'static/workbench/quick-guides/document-capabilities.html' }, } - ] + } } const { queryByTestId } = render( diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.tsx similarity index 96% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.tsx index de88956b0f..64159df645 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/EnablementArea.tsx +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/EnablementArea.tsx @@ -69,7 +69,7 @@ const EnablementArea = ({ items, openScript, loading, onOpenInternalPage }: Prop switch (type) { case EnablementAreaComponent.Group: return ( - + {renderTreeView(Object.values(children || {}) || [], level + 1)} ) @@ -83,7 +83,7 @@ const EnablementArea = ({ items, openScript, loading, onOpenInternalPage }: Prop ) case EnablementAreaComponent.InternalLink: return ( - + {args?.content || label} ) @@ -104,7 +104,9 @@ const EnablementArea = ({ items, openScript, loading, onOpenInternalPage }: Prop
{ loading ? ( -
+
+ +
) : ( { expect(onClose).toBeCalled() }) it('should parse and render JSX string', () => { - const content = ` -

Header

- - Internal Link - - ` + const content = `

Header

` const { queryByTestId } = render() expect(queryByTestId('header')).toBeInTheDocument() - expect(queryByTestId('internal-link-next-page')).toBeInTheDocument() }) }) diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/InternalPage.tsx similarity index 81% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/InternalPage.tsx index 46c16ea2ac..a0d3820ab8 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/InternalPage.tsx @@ -9,21 +9,20 @@ import { import JsxParser from 'react-jsx-parser' import cx from 'classnames' import { debounce } from 'lodash' -import { useParams } from 'react-router-dom' +import { useLocation, useParams } from 'react-router-dom' import { LazyCodeButton, - InternalLink, Image, Code, EmptyPrompt, Pagination -} from 'uiSrc/pages/workbench/components/enablament-area/EnablementArea/components' +} from 'uiSrc/pages/workbench/components/enablement-area/EnablementArea/components' import { IEnablementAreaItem } from 'uiSrc/slices/interfaces' import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry' import styles from './styles.module.scss' -import './styles.scss' +import './styles/main.scss' export interface Props { onClose: () => void; @@ -39,6 +38,7 @@ export interface Props { pagination?: IEnablementAreaItem[] } const InternalPage = (props: Props) => { + const location = useLocation() const { onClose, title, @@ -52,7 +52,7 @@ const InternalPage = (props: Props) => { id, path, } = props - const components: any = { LazyCodeButton, InternalLink, Image, Code } + const components: any = { LazyCodeButton, Image, Code } const containerRef = useRef(null) const { instanceId = '' } = useParams<{ instanceId: string }>() const handleScroll = debounce(() => { @@ -82,16 +82,28 @@ const InternalPage = (props: Props) => { } useEffect(() => { - if (!isLoading && !error && scrollTop && containerRef.current) { - setTimeout(() => { - containerRef?.current?.scroll(0, scrollTop) - }, 0) + if (!isLoading && !error && containerRef.current) { + if (location?.hash) { + const target = containerRef.current?.querySelector(location.hash) as HTMLElement + if (target) { + // HACK: force scroll to element for electron app + target.setAttribute('tabindex', '-1') + target?.focus() + return + } + } + if (scrollTop) { + setTimeout(() => { + containerRef.current?.scroll(0, scrollTop) + }, 0) + } } - }, [isLoading, scrollTop]) + }, [isLoading, location]) const contentComponent = useMemo(() => ( console.error(e)} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles.module.scss similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/styles.module.scss rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles.module.scss diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_blockquote.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_blockquote.scss new file mode 100644 index 0000000000..bb7a1e5f3a --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_blockquote.scss @@ -0,0 +1,8 @@ +@import './variables'; + +blockquote { + padding: 0 10px; + border-left: 2px solid var(--euiColorSecondary); + margin-bottom: ($margin-size-pace * 6 + px); + font-style: italic; +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_code.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_code.scss new file mode 100644 index 0000000000..0b18b07cc7 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_code.scss @@ -0,0 +1,20 @@ +@import './variables'; + +code { + background-color: var(--euiColorLightestShade); + border-radius: 4px; + padding: 3px 6px; +} + +pre > code { + display: flex; + padding: 12px; + width: 100%; + white-space: pre-wrap; + background-color: var(--euiColorLightestShade); + border-radius: 2px; + margin-bottom: ($margin-size-pace * 6 + px); + @media only screen and (max-width: ($m-breakpoint + px)) { + padding:6px; + } +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_helpers.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_helpers.scss new file mode 100644 index 0000000000..da6f5501fb --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_helpers.scss @@ -0,0 +1,14 @@ +@import './variables'; + +@mixin font{ + font: normal normal normal 14px/24px Graphik; + letter-spacing: -0.14px; + @media only screen and (max-width: ($l-breakpoint + px)) { + font: normal normal normal 13px/18px Graphik; + letter-spacing: -0.13px; + } + @media only screen and (max-width: ($m-breakpoint + px)) { + font: normal normal normal 12px/18px Graphik; + letter-spacing: -0.12px; + } +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_list.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_list.scss new file mode 100644 index 0000000000..6c9dbea02f --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_list.scss @@ -0,0 +1,57 @@ +@import './variables'; + +b + ul, strong + ul, b + ol, strong + ol { + margin-top: 10px; +} + +ul, ol { + &:not(.euiPagination__list) { + margin-bottom: ($margin-size-pace * 6 + px); + margin-left: 16px; + li { + line-height: 24px; + &:not(:last-of-type) { + margin-bottom: 12px; + } + } + @media only screen and (max-width: ($l-breakpoint + px)) { + li { + line-height: 18px; + &:not(:last-of-type) { + margin-bottom: 6px; + } + } + } + } + + p { + margin-top: ($margin-size-pace * 3 + px); + } + li p { + margin-bottom: 0; + } +} + +ul:not(.euiPagination__list) { + list-style-type: disc; + list-style-position: outside; + ul, ol { + list-style-type: circle; + list-style-position: outside; + margin-left: 16px; + } +} + +ol { + list-style-type: decimal; + list-style-position: outside; + ol, ul { + list-style-type: circle; + list-style-position: outside; + margin-left: 16px; + } +} + +ul.contains-task-list { + list-style-type: none; + margin-left: 0; +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_table.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_table.scss new file mode 100644 index 0000000000..98f834ef04 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_table.scss @@ -0,0 +1,13 @@ +@import './variables'; + +table { + th { + color: var(--htmlColor); + font-weight: normal; + } + th, td { + border: 1px solid var(--euiColorLightShade); + padding: 8px 12px; + } + margin-bottom: ($margin-size-pace * 6 + px); +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_typography.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_typography.scss new file mode 100644 index 0000000000..d9638b2b18 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_typography.scss @@ -0,0 +1,53 @@ +@import './helpers'; +@import './variables'; + +h1, h2, h3, h4, h5, h6 { + color: var(--euiColorGhost); + font: normal normal 500 14px/24px Graphik; + margin-bottom: ($margin-size-pace * 3 + px); + margin-top: ($margin-size-pace * 3 + px); + letter-spacing: 0; +} + +hr + h1, hr + h2, hr + h3, hr + h4, hr + h5, hr + h6 { + margin-top: 0; +} + +p { + margin-bottom: ($margin-size-pace * 3 + px); +} + + +a { + text-decoration: underline; + &:focus { + text-decoration: underline; + } +} + +b, strong { + @include font; + letter-spacing: -0.12px; + color: var(--htmlColor); +} + +em, i { + @include font; + b, strong { + font-style: italic; + } +} + +sup, sub { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_variables.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_variables.scss new file mode 100644 index 0000000000..3dffac3953 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/_variables.scss @@ -0,0 +1,4 @@ +$margin-size-pace: 4; +$l-breakpoint: 1440; +$m-breakpoint: 992; + diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/main.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/main.scss new file mode 100644 index 0000000000..426656b493 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/InternalPage/styles/main.scss @@ -0,0 +1,30 @@ +@import './helpers'; +@import './variables'; + +.enablement-area__page { + padding-bottom: 12px; + height: 100%; + letter-spacing: -0.12px; + .mb-s { + margin-bottom: ($margin-size-pace * 3 + px); + } + .mt-s { + margin-top: ($margin-size-pace * 3 + px); + } + + @include font; + @import './typography'; + @import './code'; + @import './list'; + @import './table'; + @import './blockquote'; + + hr { + border: none; + height: 1px; + width: 100%; + background-color: var(--separatorColor); + margin: ($margin-size-pace * 3 + px) 0; + } + +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.spec.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.spec.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx similarity index 96% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx index d998217848..c52553b198 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/LazyCodeButton.tsx @@ -4,7 +4,7 @@ import { startCase } from 'lodash' import { getApiErrorMessage, isStatusSuccessful } from 'uiSrc/utils' import { resourcesService } from 'uiSrc/services' import EnablementAreaContext from 'uiSrc/pages/workbench/contexts/enablementAreaContext' -import { getFileInfo } from 'uiSrc/pages/workbench/components/enablament-area/EnablementArea/utils/getFileInfo' +import { getFileInfo } from 'uiSrc/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo' import CodeButton from '../CodeButton' diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyCodeButton/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyCodeButton/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx similarity index 95% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx index e708fb5ed8..c86197d1e7 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyInternalPage/LazyInternalPage.tsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react' import { startCase } from 'lodash' +import { useHistory } from 'react-router-dom' import { useDispatch, useSelector } from 'react-redux' import axios from 'axios' @@ -32,6 +33,7 @@ export interface Props { } const LazyInternalPage = ({ onClose, title, path }: Props) => { + const history = useHistory() const { guideScrollTop } = useSelector(appContextWorkbenchEA) const enablementArea = useSelector(workbenchEnablementAreaSelector) const [isLoading, setLoading] = useState(false) @@ -51,7 +53,7 @@ const LazyInternalPage = ({ onClose, title, path }: Props) => { const { data, status } = await fetchService.get(path) if (isStatusSuccessful(status)) { dispatch(setWorkbenchEAGuide(path)) - const contentData = await formatter.format(data) + const contentData = await formatter.format(data, { history }) setPageData((prevState) => ({ ...prevState, content: contentData })) setLoading(false) } diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyInternalPage/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyInternalPage/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/LazyInternalPage/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/LazyInternalPage/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/Pagination.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/Pagination.spec.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/Pagination.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/Pagination.spec.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/Pagination.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/Pagination.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/Pagination.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/Pagination.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/styles.module.scss similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/Pagination/styles.module.scss rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/Pagination/styles.module.scss diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/PlainText.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/PlainText.spec.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/PlainText.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/PlainText.spec.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/PlainText.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/PlainText.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/PlainText.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/PlainText.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/PlainText/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/PlainText/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/styles.module.scss similarity index 92% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/styles.module.scss rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/styles.module.scss index cacfe4539c..54b5e219e8 100644 --- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/styles.module.scss +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/styles.module.scss @@ -18,6 +18,10 @@ color: var(--euiTextSubduedColor) !important; } +.innerContainerLoader { + padding: 12px 18px !important; +} + .internalPage { width: 100%; max-width: 100%; diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/FormatSelector.spec.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/FormatSelector.spec.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/FormatSelector.spec.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/FormatSelector.spec.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/FormatSelector.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/FormatSelector.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/FormatSelector.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/FormatSelector.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/HtmlToJsxString.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/HtmlToJsxString.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/formatter/HtmlToJsxString.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/HtmlToJsxString.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts new file mode 100644 index 0000000000..4c0d6969bc --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/MarkdownToJsxString.ts @@ -0,0 +1,43 @@ +import { unified } from 'unified' +import remarkParse from 'remark-parse' +import remarkRehype from 'remark-rehype' +import remarkGfm from 'remark-gfm' +import rehypeStringify from 'rehype-stringify' +import { visit } from 'unist-util-visit' + +import { rehypeLinks } from '../rehypeLinks' +import { remarkRedisCode } from '../remarkRedisCode' +import { IFormatter, IFormatterConfig } from './formatter.interfaces' + +class MarkdownToJsxString implements IFormatter { + format(data: any, config?: IFormatterConfig): Promise { + return new Promise((resolve, reject) => { + unified() + .use(remarkParse) + .use(remarkGfm) // support GitHub Flavored Markdown + .use(remarkRedisCode) // Add custom component for Redis code block + .use(remarkRehype, { allowDangerousHtml: true }) // Pass raw HTML strings through. + .use(rehypeLinks, config ? { history: config.history } : undefined) // Customise links + .use(MarkdownToJsxString.rehypeWrapSymbols) // Wrap special symbols inside curly braces for JSX parse + .use(rehypeStringify, { allowDangerousHtml: true }) // Serialize the raw HTML strings + .process(data) + .then((file) => { + resolve(String(file)) + }) + .catch((error) => reject(error)) + }) + } + + private static rehypeWrapSymbols(symbols: string[] = ['{', '}', '>']): (tree: Node) => void { + return (tree: any) => { + visit(tree, 'text', (node) => { + const { value } = node + if (value) { + node.value = value.replace(new RegExp(`[${symbols.join()}]`, 'g'), '{"$&"}') + } + }) + } + } +} + +export default MarkdownToJsxString diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/formatter.interfaces.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/formatter.interfaces.ts new file mode 100644 index 0000000000..ec138f0d59 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/formatter/formatter.interfaces.ts @@ -0,0 +1,9 @@ +import { History } from 'history' + +export interface IFormatterConfig { + history: History +} + +export interface IFormatter { + format(data: any, config?: IFormatterConfig): Promise; +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/getFileInfo.spec.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo.spec.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/getFileInfo.spec.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo.spec.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/getFileInfo.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/utils/getFileInfo.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/rehypeLinks.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/rehypeLinks.ts new file mode 100644 index 0000000000..21d00bd610 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/rehypeLinks.ts @@ -0,0 +1,25 @@ +import { visit } from 'unist-util-visit' +import { IS_ABSOLUTE_PATH } from 'uiSrc/constants/regex' +import { createLocation, History } from 'history' + +interface IConfig { + history: History +} + +export const rehypeLinks = (config?: IConfig): (tree: Node) => void => (tree: any) => { + visit(tree, 'element', (node) => { + if (node.tagName === 'a' && node.properties && typeof node.properties.href === 'string') { + const url: string = node.properties.href + if (IS_ABSOLUTE_PATH.test(url)) { // External link + node.properties.rel = ['nofollow', 'noopener', 'noreferrer'] + node.properties.target = '_blank' + } + if (url.startsWith('#') && config?.history) { + const { location: currentLocation } = config.history + const newLocation = createLocation(url, null, '', currentLocation) + newLocation.search = currentLocation.search + node.properties.href = config.history.createHref(newLocation) + } + } + }) +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/remarkRedisCode.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/remarkRedisCode.ts new file mode 100644 index 0000000000..377464eca3 --- /dev/null +++ b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/remarkRedisCode.ts @@ -0,0 +1,14 @@ +import { visit } from 'unist-util-visit' + +export const remarkRedisCode = (): (tree: Node) => void => (tree: any) => { + // Find code node in syntax tree + visit(tree, 'code', (codeNode) => { + const { value, meta, lang } = codeNode + // Check that it has a language unsupported by our editor + if (lang === 'redis') { + codeNode.type = 'html' + // Replace it with our custom component + codeNode.value = `{${JSON.stringify(value)}}` + } + }) +} diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/EnablementAreaCollapse.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/EnablementAreaCollapse.spec.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/EnablementAreaCollapse.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/EnablementAreaCollapse.spec.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/EnablementAreaCollapse.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/EnablementAreaCollapse.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/EnablementAreaCollapse.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/EnablementAreaCollapse.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/styles.module.scss similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaCollapse/styles.module.scss rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaCollapse/styles.module.scss diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaWrapper.spec.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaWrapper.spec.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaWrapper.spec.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaWrapper.spec.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaWrapper.tsx b/redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaWrapper.tsx similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementAreaWrapper.tsx rename to redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementAreaWrapper.tsx diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/index.ts b/redisinsight/ui/src/pages/workbench/components/enablement-area/index.ts similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/index.ts rename to redisinsight/ui/src/pages/workbench/components/enablement-area/index.ts diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/enablement-area/styles.module.scss similarity index 100% rename from redisinsight/ui/src/pages/workbench/components/enablament-area/styles.module.scss rename to redisinsight/ui/src/pages/workbench/components/enablement-area/styles.module.scss diff --git a/redisinsight/ui/src/pages/workbench/components/module-not-loaded/styles.module.scss b/redisinsight/ui/src/pages/workbench/components/module-not-loaded/styles.module.scss index 35fed57e1c..f45c597491 100644 --- a/redisinsight/ui/src/pages/workbench/components/module-not-loaded/styles.module.scss +++ b/redisinsight/ui/src/pages/workbench/components/module-not-loaded/styles.module.scss @@ -53,18 +53,19 @@ width: 413px; height: 64px; padding-right: 40px; - background: url(../../../../assets/img/NYbg.jpg) center; background-size: cover; - &::before { - content: ''; - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - background-color: var(--overlayPromoNYColor); - } + // For future promo implementations + //background: url(../../../../assets/img/NYbg.jpg) center; + //&::before { + // content: ''; + // position: absolute; + // top: 0px; + // right: 0px; + // bottom: 0px; + // left: 0px; + // background-color: var(--overlayPromoNYColor); + //} &:hover { transform: translateY(-1px); @@ -73,14 +74,12 @@ .createTitle { padding-top: 3px; line-height: 16px; - color: #ffffff !important; position: relative; font-weight: 500 !important; } .createText { font-size: 12px !important; - color: #ffffff !important; position: relative; } diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.spec.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.spec.tsx index 46771c13c3..fe36d7612d 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.spec.tsx @@ -1,7 +1,7 @@ import { cloneDeep } from 'lodash' import React from 'react' import { instance, mock } from 'ts-mockito' -import { WBHistoryObject } from 'uiSrc/pages/workbench/interfaces' +import { CommandExecutionUI } from 'uiSrc/slices/interfaces' import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils' import WBResults, { Props } from './WBResults' @@ -24,55 +24,35 @@ jest.mock('uiSrc/services', () => ({ describe('WBResults', () => { it('should render', () => { - // connectedInstanceSelector.mockImplementation(() => ({ - // id: '123', - // connectionType: 'CLUSTER', - // })); - - // const sendCliClusterActionMock = jest.fn(); + expect(render()).toBeTruthy() + }) - // sendCliClusterCommandAction.mockImplementation(() => sendCliClusterActionMock); + it('should not render NoResults component with empty items', () => { + const { getByTestId } = render() - expect(render()).toBeTruthy() + expect(getByTestId('wb_no-results')).toBeInTheDocument() }) it('should render with custom props', () => { - const historyItemsMock: WBHistoryObject[] = [ + const itemsMock: CommandExecutionUI[] = [ { - query: 'query1', - data: 'data1', - id: 1, - fromPersistentStore: true, + id: '1', + command: 'query1', + result: [{ + response: 'data1', + status: 'success' + }], }, { - query: 'query2', - data: 'data2', - id: 2, - fromPersistentStore: true, + id: '2', + command: 'query2', + result: [{ + response: 'data2', + status: 'success' + }], }, ] - expect(render()).toBeTruthy() - }) - - it('should not render NoResults component with empty history', () => { - const { getByTestId } = render() - - expect(getByTestId('wb_no-results')).toBeInTheDocument() - }) - - it('should render NoResults component with history', () => { - const historyItemsMock: WBHistoryObject[] = [{ - query: 'query1', - data: 'data1', - id: 1, - fromPersistentStore: true, - }] - - const { queryByTestId } = render() - - const noResultsEl = queryByTestId('wb_no-results') - - expect(noResultsEl).not.toBeInTheDocument() + expect(render()).toBeTruthy() }) }) diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx index 87481f158e..8392c0a15d 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx @@ -4,20 +4,21 @@ import { EuiIcon, EuiText } from '@elastic/eui' import { Theme } from 'uiSrc/constants' import QueryCard from 'uiSrc/components/query-card' -import { WBHistoryObject } from 'uiSrc/pages/workbench/interfaces' import { WBQueryType } from 'uiSrc/pages/workbench/constants' +import { CommandExecutionUI } from 'uiSrc/slices/interfaces' import { ThemeContext } from 'uiSrc/contexts/themeContext' import MultiPlayIconDark from 'uiSrc/assets/img/multi_play_icon_dark.svg' import MultiPlayIconLight from 'uiSrc/assets/img/multi_play_icon_light.svg' import styles from './styles.module.scss' export interface Props { - historyItems: Array; + items: CommandExecutionUI[]; scrollDivRef: React.Ref; - onQueryRun: (query: string, historyId?: number, type?: WBQueryType) => void; - onQueryDelete: (historyId: number) => void + onQueryReRun: (query: string, commandId?: string, type?: WBQueryType) => void; + onQueryDelete: (commandId: string) => void + onQueryOpen: (commandId: string) => void } -const WBResults = ({ historyItems = [], onQueryRun, onQueryDelete, scrollDivRef }: Props) => { +const WBResults = ({ items = [], onQueryReRun, onQueryDelete, onQueryOpen, scrollDivRef }: Props) => { const { theme } = useContext(ThemeContext) const NoResults = ( @@ -37,22 +38,21 @@ const WBResults = ({ historyItems = [], onQueryRun, onQueryDelete, scrollDivRef return (
- {historyItems.map(({ query, data, id, time, fromPersistentStore, loading, status }) => ( + {items.map(({ command = '', isOpen = false, result = undefined, id = '', loading, createdAt }) => ( onQueryRun(query, id, queryType)} - onQueryReRun={() => onQueryRun(query)} + command={command} + createdAt={createdAt} + onQueryOpen={() => onQueryOpen(id)} + onQueryReRun={() => onQueryReRun(command)} onQueryDelete={() => onQueryDelete(id)} /> ))} - {!historyItems.length && NoResults} + {!items.length && NoResults}
) } diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.spec.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.spec.tsx index d77ca2e845..0e9e0810fe 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.spec.tsx @@ -1,22 +1,16 @@ import { cloneDeep } from 'lodash' import React from 'react' import { instance, mock } from 'ts-mockito' -import HistoryContainer from 'uiSrc/services/queryHistory' import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils' import WBResultsWrapper, { Props } from './WBResultsWrapper' -import { WORKBENCH_HISTORY_WRAPPER_NAME } from '../../constants' -import { WBHistoryObject } from '../../interfaces' - const mockedProps = mock() let store: typeof mockedStore -let history: HistoryContainer beforeEach(() => { cleanup() store = cloneDeep(mockedStore) store.clearActions() - history = new HistoryContainer(WORKBENCH_HISTORY_WRAPPER_NAME) }) jest.mock('uiSrc/services', () => ({ diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx index f1c6636c0a..768b175a3d 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx @@ -1,13 +1,14 @@ import React from 'react' +import { CommandExecutionUI } from 'uiSrc/slices/interfaces' import WBResults from './WBResults' -import { WBHistoryObject } from '../../interfaces' import { WBQueryType } from '../../constants' export interface Props { - historyItems: Array; + items: CommandExecutionUI[]; scrollDivRef: React.Ref; - onQueryRun: (query: string, historyId?: number, type?: WBQueryType) => void; - onQueryDelete: (historyId: number) => void + onQueryReRun: (query: string, commandId?: string, type?: WBQueryType) => void; + onQueryOpen: (commandId: string) => void + onQueryDelete: (commandId: string) => void } const WBResultsWrapper = (props: Props) => ( diff --git a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.spec.tsx b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.spec.tsx index bb36a1abf1..27569e124f 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.spec.tsx @@ -2,17 +2,12 @@ import { cloneDeep } from 'lodash' import React from 'react' import { instance, mock } from 'ts-mockito' // import MonacoEditor from 'react-monaco-editor' -import { WORKBENCH_HISTORY_WRAPPER_NAME } from 'uiSrc/pages/workbench/constants' -import { WBHistoryObject } from 'uiSrc/pages/workbench/interfaces' -import HistoryContainer from 'uiSrc/services/queryHistory' -import { updateWBHistoryStorage } from 'uiSrc/utils' import { cleanup, fireEvent, mockedStore, render } from 'uiSrc/utils/test-utils' import WBView, { Props } from './WBView' const mockedProps = mock() let store: typeof mockedStore -const history = new HistoryContainer(WORKBENCH_HISTORY_WRAPPER_NAME) beforeEach(() => { cleanup() @@ -40,7 +35,7 @@ jest.mock('uiSrc/slices/workbench/wb-enablement-area', () => { describe('WBView', () => { it('should render', () => { - expect(render()).toBeTruthy() + expect(render()).toBeTruthy() }) describe('Workbench input keyboard cases', () => { @@ -51,7 +46,6 @@ describe('WBView', () => { const { queryByTestId } = render( @@ -64,7 +58,6 @@ describe('WBView', () => { ctrlKey: true, }) - expect(updateWBHistoryStorage).toBeCalledWith(command, expect.any(Function)) expect(onSubmitMock).toBeCalled() }) }) diff --git a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx index fbb4a5645c..2effdad54b 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx @@ -9,15 +9,15 @@ import { BrowserStorageItem } from 'uiSrc/constants' import { localStorageService } from 'uiSrc/services' import InstanceHeader from 'uiSrc/components/instance-header' import QueryWrapper from 'uiSrc/components/query' -import { WBHistoryObject } from 'uiSrc/pages/workbench/interfaces' import { WBQueryType } from 'uiSrc/pages/workbench/constants' import { setWorkbenchVerticalPanelSizes, appContextWorkbench } from 'uiSrc/slices/app/context' +import { CommandExecutionUI } from 'uiSrc/slices/interfaces' import WBResultsWrapper from '../../wb-results' -import EnablementAreaWrapper from '../../enablament-area' +import EnablementAreaWrapper from '../../enablement-area' import styles from './styles.module.scss' @@ -29,18 +29,29 @@ const verticalPanelIds = { export interface Props { script: string; loading: boolean; - historyItems: Array; + items: CommandExecutionUI[]; setScript: (script: string) => void; setScriptEl: Function; scriptEl: Nullable; scrollDivRef: Ref; - onSubmit: (query?: string, historyId?: number, type?: WBQueryType) => void; - onQueryDelete: (historyId: number) => void + onSubmit: (query?: string, commandId?: string, type?: WBQueryType) => void; + onQueryOpen: (commandId?: string) => void; + onQueryDelete: (commandId: string) => void } const WBView = (props: Props) => { - const { script = '', loading, setScript, setScriptEl, - scriptEl, onSubmit, onQueryDelete, scrollDivRef, historyItems } = props + const { + script = '', + items, + loading, + setScript, + setScriptEl, + scriptEl, + onSubmit, + onQueryOpen, + onQueryDelete, + scrollDivRef, + } = props const [isMinimized, setIsMinimized] = useState( (localStorageService?.get(BrowserStorageItem.isEnablementAreaMinimized) ?? 'false') === 'true' ) @@ -113,9 +124,10 @@ const WBView = (props: Props) => { style={{ maxHeight: 'calc(100% - 140px)' }} > diff --git a/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.spec.tsx b/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.spec.tsx index 1d220eae48..9b800749ed 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.spec.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.spec.tsx @@ -12,8 +12,7 @@ import { } from 'uiSrc/utils/test-utils' import QueryWrapper, { Props as QueryProps } from 'uiSrc/components/query' import { connectedInstanceSelector } from 'uiSrc/slices/instances' -import { processWBClient } from 'uiSrc/slices/workbench/wb-settings' -import { sendWBCommandClusterAction } from 'uiSrc/slices/workbench/wb-results' +import { sendWBCommandAction } from 'uiSrc/slices/workbench/wb-results' import { getWBEnablementArea } from 'uiSrc/slices/workbench/wb-enablement-area' import WBViewWrapper from './WBViewWrapper' @@ -102,7 +101,7 @@ describe('WBViewWrapper', () => { it('should render with SessionStorage', () => { render() - const expectedActions = [getWBEnablementArea(), processWBClient()] + const expectedActions = [getWBEnablementArea()] expect(clearStoreActions(store.getActions().slice(0, expectedActions.length))).toEqual( clearStoreActions(expectedActions) ) @@ -116,7 +115,7 @@ describe('WBViewWrapper', () => { const sendWBCommandClusterActionMock = jest.fn() - sendWBCommandClusterAction.mockImplementation(() => sendWBCommandClusterActionMock) + sendWBCommandAction.mockImplementation(() => sendWBCommandClusterActionMock) const { queryAllByTestId } = render() diff --git a/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx b/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx index 55de157c13..7e69ae9f19 100644 --- a/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx +++ b/redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx @@ -6,41 +6,30 @@ import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api' import { Nullable, - checkBlockingCommand, - checkUnsupportedCommand, removeMonacoComments, - checkUnsupportedModuleCommand, - cliParseTextResponse, splitMonacoValuePerLines, getMultiCommands, } from 'uiSrc/utils' import { sendWBCommandAction, workbenchResultsSelector, + fetchWBHistoryAction, + deleteWBCommandAction, sendWBCommandClusterAction, + resetWBHistoryItems, + fetchWBCommandAction, } from 'uiSrc/slices/workbench/wb-results' -import { ConnectionType, Instance, IPluginVisualization, RedisDefaultModules } from 'uiSrc/slices/interfaces' +import { ConnectionType, Instance, IPluginVisualization } from 'uiSrc/slices/interfaces' import { initialState as instanceInitState, connectedInstanceSelector } from 'uiSrc/slices/instances' -import HistoryContainer from 'uiSrc/services/queryHistory' -import { ClusterNodeRole, CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' +import { ClusterNodeRole } from 'uiSrc/slices/interfaces/cli' -import { createWBClientAction, updateWBClientAction, workbenchSettingsSelector } from 'uiSrc/slices/workbench/wb-settings' import { cliSettingsSelector, fetchBlockingCliCommandsAction } from 'uiSrc/slices/cli/cli-settings' import { appContextWorkbench, setWorkbenchScript } from 'uiSrc/slices/app/context' import { appPluginsSelector } from 'uiSrc/slices/app/plugins' -import { cliTexts } from 'uiSrc/constants/cliOutput' import { SendClusterCommandDto } from 'apiSrc/modules/cli/dto/cli.dto' import WBView from './WBView' -import ModuleNotLoaded from '../module-not-loaded' -import { - RSNotLoadedContent, - WORKBENCH_HISTORY_MAX_LENGTH, - WORKBENCH_HISTORY_WRAPPER_NAME, -} from '../../constants' -import { WBHistoryObject } from '../../interfaces' -let historyContainer: HistoryContainer interface IState { loading: boolean, instance: Instance, @@ -62,17 +51,15 @@ let state: IState = { const WBViewWrapper = () => { const { instanceId } = useParams<{ instanceId: string }>() - const { loading } = useSelector(workbenchResultsSelector) + const { loading, items } = useSelector(workbenchResultsSelector) const { unsupportedCommands, blockingCommands } = useSelector(cliSettingsSelector) const { script: scriptContext } = useSelector(appContextWorkbench) - const [historyItems, setHistoryItems] = useState>([]) const [script, setScript] = useState(scriptContext) const [multiCommands, setMultiCommands] = useState('') const [scriptEl, setScriptEl] = useState>(null) const instance = useSelector(connectedInstanceSelector) - const { wbClientUuid = '' } = useSelector(workbenchSettingsSelector) const { visualizations = [] } = useSelector(appPluginsSelector) state = { scriptEl, @@ -88,21 +75,10 @@ const WBViewWrapper = () => { const dispatch = useDispatch() useEffect(() => { - historyContainer = new HistoryContainer( - `${WORKBENCH_HISTORY_WRAPPER_NAME}_${instanceId}` - ) - if (!instanceId) { - return - } - setHistoryItems(historyContainer.getData()) - if (wbClientUuid) { - dispatch(updateWBClientAction(instanceId, wbClientUuid)) - } else { - dispatch(createWBClientAction(instanceId)) - } + dispatch(fetchWBHistoryAction(instanceId)) - // componentWillUnmount return () => { + dispatch(resetWBHistoryItems()) dispatch(setWorkbenchScript(scriptRef.current)) } }, []) @@ -121,43 +97,17 @@ const WBViewWrapper = () => { if (multiCommands) { handleSubmit(multiCommands) } - }, [historyItems]) - - const getUnsupportedCommandResponse = (commandLine = '') => { - const { modules } = state.instance - const { unsupportedCommands, blockingCommands } = state - const unsupportedCommand = checkUnsupportedCommand(unsupportedCommands, commandLine) - || checkBlockingCommand(blockingCommands, commandLine) - - if (unsupportedCommand) { - return cliParseTextResponse( - cliTexts.WORKBENCH_UNSUPPORTED_COMMANDS( - commandLine.slice(0, unsupportedCommand.length), - [...blockingCommands, ...unsupportedCommands].join(', '), - ), - commandLine, - CommandExecutionStatus.Fail, - ) - } - const unsupportedModule = checkUnsupportedModuleCommand(modules, commandLine) - - if (unsupportedModule === RedisDefaultModules.Search) { - return - } - - return null - } + }, [multiCommands]) const handleSubmit = ( commandInit: string = script, - historyId?: number, + commandId?: string, ) => { const { loading } = state - const isNewCommand = () => !historyId + const isNewCommand = () => !commandId const [command, ...rest] = splitMonacoValuePerLines(commandInit) const multiCommands = getMultiCommands(rest) - setMultiCommands(multiCommands) let commandLine = decode(command).trim() @@ -165,46 +115,25 @@ const WBViewWrapper = () => { commandLine = removeMonacoComments(commandLine) if (!commandLine || loading) { - multiCommands && setHistoryItems((history) => [...history]) + setMultiCommands(multiCommands) return } isNewCommand() && scrollResults('start') - const unsupportedCommand = getUnsupportedCommandResponse(commandLine) - - if (unsupportedCommand) { - onSuccess({ - id: historyId || Date.now(), - query: commandLine, - data: unsupportedCommand, - time: Date.now() - }) - return - } - - checkClient(commandLine, historyId || Date.now()) - } - - const checkClient = ( - command: string, - historyId = Date.now() - ) => { - if (!wbClientUuid) { - dispatch(createWBClientAction(instanceId, () => sendCommand(command, historyId || Date.now()))) - } else { - sendCommand(command, historyId || Date.now()) - } + sendCommand(commandLine, multiCommands) } const sendCommand = ( command: string, - historyId = Date.now(), + multiCommands = '' ) => { const { connectionType, host, port } = state.instance if (connectionType !== ConnectionType.Cluster) { dispatch(sendWBCommandAction({ - command, historyId, onSuccessAction: onSuccess + command, + multiCommands, + onSuccessAction: onSuccess, })) return } @@ -221,26 +150,16 @@ const WBViewWrapper = () => { dispatch( sendWBCommandClusterAction({ command, - historyId, options, + multiCommands, onSuccessAction: onSuccess, }) ) } - const onSuccess = (historyResponse: WBHistoryObject) => { - if (historyContainer.hasId(historyResponse?.id)) { - historyContainer.replaceHistoryItem(historyResponse?.id, historyResponse) - } else { - if (historyContainer.getLength() >= WORKBENCH_HISTORY_MAX_LENGTH) { - historyContainer.deleteHistoryLastItem() - } - - historyContainer.pushData(historyResponse) - resetCommand() - } - - setHistoryItems(historyContainer.getData()) + const onSuccess = (multiCommands = '') => { + resetCommand() + setMultiCommands(multiCommands) } const scrollResults = (inline: ScrollLogicalPosition = 'start') => { @@ -251,11 +170,12 @@ const WBViewWrapper = () => { }) } - const onQueryDelete = (historyId: number) => { - if (historyContainer.hasId(historyId)) { - historyContainer.deleteHistoryItem(historyId) - setHistoryItems(historyContainer.getData()) - } + const handleQueryDelete = (commandId: string) => { + dispatch(deleteWBCommandAction(commandId, onSuccess)) + } + + const handleQueryOpen = (commandId: string = '') => { + dispatch(fetchWBCommandAction(commandId)) } const resetCommand = () => { @@ -265,7 +185,7 @@ const WBViewWrapper = () => { return ( { scriptEl={scriptEl} scrollDivRef={scrollDivRef} onSubmit={handleSubmit} - onQueryDelete={onQueryDelete} + onQueryOpen={handleQueryOpen} + onQueryDelete={handleQueryDelete} /> ) } diff --git a/redisinsight/ui/src/pages/workbench/interfaces.ts b/redisinsight/ui/src/pages/workbench/interfaces.ts index 3959f93ce8..c48406f963 100644 --- a/redisinsight/ui/src/pages/workbench/interfaces.ts +++ b/redisinsight/ui/src/pages/workbench/interfaces.ts @@ -1,17 +1,4 @@ import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api' -import { Maybe } from 'uiSrc/utils' -import { IHistoryObject } from 'uiSrc/services/queryHistory' -import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' -import { SendClusterCommandResponse, SendCommandResponse } from 'apiSrc/modules/cli/dto/cli.dto' - -export interface WBHistoryObject extends IHistoryObject { - id: number; - query: string; - data: SendClusterCommandResponse[] | SendCommandResponse | JSX.Element | string | null | undefined; - status?: Maybe; - loading?: boolean; - time?: number -} export interface IEditorMount { editor: monacoEditor.editor.IStandaloneCodeEditor diff --git a/redisinsight/ui/src/plugins/pluginEvents.ts b/redisinsight/ui/src/plugins/pluginEvents.ts index 1acee84246..17360105ae 100644 --- a/redisinsight/ui/src/plugins/pluginEvents.ts +++ b/redisinsight/ui/src/plugins/pluginEvents.ts @@ -15,33 +15,49 @@ export enum PluginEvents { loaded = 'loaded', error = 'error', heightChanged = 'heightChanged', - setHeaderText = 'setHeaderText' + setHeaderText = 'setHeaderText', + executeRedisCommand = 'executeRedisCommand', + getState = 'getState', + setState = 'setState' } export const listenPluginsEvents = () => { globalThis.onmessage = (e: MessageEvent) => { switch (e.data?.event) { - case 'loaded': { - pluginApi.sendEvent(e.data.iframeId, 'loaded') + case PluginEvents.loaded: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.loaded) break } - case 'error': { - pluginApi.sendEvent(e.data.iframeId, 'error', e.data.error) + case PluginEvents.error: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.error, e.data.error) break } - case 'heightChanged': { - pluginApi.sendEvent(e.data.iframeId, 'heightChanged', e.data.height) + case PluginEvents.heightChanged: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.heightChanged, e.data.height) break } - case 'executeRedisCommand': { - // pluginApi.sendEvent(e.data.iframeId, 'executeRedisCommand', { - // command: e.data.command, - // requestId: e.data.requestId - // }) + case PluginEvents.executeRedisCommand: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.executeRedisCommand, { + command: e.data.command, + requestId: e.data.requestId + }) break } - case 'setHeaderText': { - pluginApi.sendEvent(e.data.iframeId, 'setHeaderText', e.data.text) + case PluginEvents.setHeaderText: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.setHeaderText, e.data.text) + break + } + case PluginEvents.getState: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.getState, { + requestId: e.data.requestId + }) + break + } + case PluginEvents.setState: { + pluginApi.sendEvent(e.data.iframeId, PluginEvents.setState, { + requestId: e.data.requestId, + state: e.data.state + }) break } case 'click': { diff --git a/redisinsight/ui/src/plugins/pluginImport.ts b/redisinsight/ui/src/plugins/pluginImport.ts index 60ae06a24f..ec9e98608b 100644 --- a/redisinsight/ui/src/plugins/pluginImport.ts +++ b/redisinsight/ui/src/plugins/pluginImport.ts @@ -2,17 +2,22 @@ /* eslint-disable no-restricted-globals */ // @ts-nocheck export const importPluginScript = () => (config) => { - const { scriptSrc, stylesSrc, iframeId, modules, baseUrl } = JSON.parse(config) + const { scriptSrc, stylesSrc, iframeId, modules, baseUrl, appVersion } = JSON.parse(config) const events = { + ERROR: 'error', + LOADED: 'loaded', EXECUTE_COMMAND: 'executeCommand', - EXECUTE_REDIS_COMMAND: 'executeRedisCommand' + SET_HEADER_TEXT: 'setHeaderText', + EXECUTE_REDIS_COMMAND: 'executeRedisCommand', + GET_STATE: 'getState', + SET_STATE: 'setState' } Object.defineProperty(globalThis, 'state', { value: { callbacks: { counter: 0 }, pluginState: {}, - config: { scriptSrc, stylesSrc, iframeId, baseUrl }, + config: { scriptSrc, stylesSrc, iframeId, baseUrl, appVersion }, modules }, writable: false @@ -32,50 +37,89 @@ export const importPluginScript = () => (config) => { globalThis.PluginSDK = { setHeaderText: (text) => { sendMessageToMain({ - event: 'setHeaderText', + event: events.SET_HEADER_TEXT, iframeId, text }) }, setPluginLoadSucceed: () => { sendMessageToMain({ - event: 'loaded', + event: events.LOADED, iframeId, }) }, setPluginLoadFailed: (error) => { sendMessageToMain({ - event: 'error', + event: events.ERROR, iframeId, error, }) - } + }, + executeRedisCommand: (command = '') => new Promise((resolve, reject) => { + const { callbacks } = globalThis.state + callbacks[callbacks.counter] = { resolve, reject } + sendMessageToMain({ + event: events.EXECUTE_REDIS_COMMAND, + iframeId, + command, + requestId: callbacks.counter++ + }) + }), + getState: () => new Promise((resolve, reject) => { + const { callbacks } = globalThis.state + callbacks[callbacks.counter] = { resolve, reject } + sendMessageToMain({ + event: events.GET_STATE, + iframeId, + requestId: callbacks.counter++ + }) + }), + setState: (state: any) => new Promise((resolve, reject) => { + const { callbacks } = globalThis.state + callbacks[callbacks.counter] = { resolve, reject } + sendMessageToMain({ + event: events.SET_STATE, + iframeId, + state, + requestId: callbacks.counter++ + }) + }) } } const listenEvents = () => { + const promiseEvents = [ + events.EXECUTE_REDIS_COMMAND, + events.GET_STATE, + events.SET_STATE + ] globalThis.onmessage = (e) => { // eslint-disable-next-line sonarjs/no-collapsible-if if (e.data.event === events.EXECUTE_COMMAND) { const { plugin } = globalThis // eslint-disable-next-line no-prototype-builtins - if (plugin.hasOwnProperty(e.data.method)) { - const action = plugin[e.data.method] - if (typeof action === 'function') { - action(e.data.data) - } + if (!plugin.hasOwnProperty(e.data.method)) { + return + } + const action = plugin[e.data.method] + if (typeof action === 'function') { + action(e.data.data) } } // eslint-disable-next-line sonarjs/no-collapsible-if - if (e.data.event === events.EXECUTE_REDIS_COMMAND) { + if (promiseEvents.includes(e.data.event)) { // eslint-disable-next-line no-prototype-builtins if (callbacks.hasOwnProperty(e.data.requestId)) { - const action = callbacks[e.data.requestId] - if (typeof action === 'function') { - action(e.data.data) + const actions = callbacks[e.data.requestId] + // eslint-disable-next-line no-prototype-builtins + if (actions && actions.hasOwnProperty(e.data.actionType)) { + const action = actions[e.data.actionType] + if (typeof action === 'function') { + action(e.data.data) + } + delete callbacks[e.data.requestId] } - delete callbacks[e.data.requestId] } } } diff --git a/redisinsight/ui/src/services/apiService.ts b/redisinsight/ui/src/services/apiService.ts index 09ec5ca0da..cdfe2b1eff 100644 --- a/redisinsight/ui/src/services/apiService.ts +++ b/redisinsight/ui/src/services/apiService.ts @@ -11,6 +11,6 @@ axios.defaults.adapter = require('axios/lib/adapters/http') export default axios.create({ baseURL: !isDevelopment && isWebApp - ? `${baseApiUrl}` + ? `${window.location.origin}/api/` : `${baseApiUrl}:${apiPort}/${apiPrefix}/`, }) diff --git a/redisinsight/ui/src/slices/app/plugins.ts b/redisinsight/ui/src/slices/app/plugins.ts index 819b2c6b6d..8dc62641b5 100644 --- a/redisinsight/ui/src/slices/app/plugins.ts +++ b/redisinsight/ui/src/slices/app/plugins.ts @@ -13,6 +13,7 @@ import { IPlugin, PluginsResponse, StateAppPlugins } from 'uiSrc/slices/interfac import { SendCommandResponse } from 'src/modules/cli/dto/cli.dto' import { AppDispatch, RootState } from '../store' +import { PluginState } from 'src/modules/workbench/models/plugin-state'; export const initialState: StateAppPlugins = { loading: false, @@ -97,7 +98,7 @@ export function loadPluginsAction() { export function sendPluginCommandAction({ command = '', onSuccessAction, onFailAction }: { command: string; onSuccessAction?: (responseData: any) => void; - onFailAction?: () => void; + onFailAction?: (error: any) => void; }) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { try { @@ -107,14 +108,11 @@ export function sendPluginCommandAction({ command = '', onSuccessAction, onFailA const { data, status } = await apiService.post( getUrl( id, - ApiEndpoints.CLI, - state.workbench.settings?.wbClientUuid, - ApiEndpoints.SEND_COMMAND + ApiEndpoints.PLUGINS, + ApiEndpoints.COMMAND_EXECUTIONS ), { - command: multilineCommandToOneLine(command), - outputFormat: 'RAW', - plugins: true + command: multilineCommandToOneLine(command) } ) @@ -122,7 +120,73 @@ export function sendPluginCommandAction({ command = '', onSuccessAction, onFailA onSuccessAction?.(data) } } catch (error) { - onFailAction?.() + onFailAction?.(error) + } + } +} + +export function getPluginStateAction({ visualizationId = '', commandId = '', onSuccessAction, onFailAction }: { + visualizationId: string; + commandId: string; + onSuccessAction?: (responseData: any) => void; + onFailAction?: (error: any) => void; +}) { + return async (dispatch: AppDispatch, stateInit: () => RootState) => { + try { + const state = stateInit() + const { id = '' } = state.connections.instances.connectedInstance + + const { data, status } = await apiService.get( + getUrl( + id, + ApiEndpoints.PLUGINS, + visualizationId, + ApiEndpoints.COMMAND_EXECUTIONS, + commandId, + ApiEndpoints.STATE + ) + ) + + if (isStatusSuccessful(status)) { + onSuccessAction?.(data) + } + } catch (error) { + onFailAction?.(error) + } + } +} + +export function setPluginStateAction({ visualizationId = '', commandId = '', pluginState, onSuccessAction, onFailAction }: { + visualizationId: string; + commandId: string; + pluginState: any; + onSuccessAction?: (responseData: any) => void; + onFailAction?: (error: any) => void; +}) { + return async (dispatch: AppDispatch, stateInit: () => RootState) => { + try { + const state = stateInit() + const { id = '' } = state.connections.instances.connectedInstance + + const { data, status } = await apiService.post( + getUrl( + id, + ApiEndpoints.PLUGINS, + visualizationId, + ApiEndpoints.COMMAND_EXECUTIONS, + commandId, + ApiEndpoints.STATE + ), + { + state: pluginState + } + ) + + if (isStatusSuccessful(status)) { + onSuccessAction?.(data) + } + } catch (error) { + onFailAction?.(error) } } } diff --git a/redisinsight/ui/src/slices/cli/cli-output.ts b/redisinsight/ui/src/slices/cli/cli-output.ts index 139bc87174..b69d4ec2d8 100644 --- a/redisinsight/ui/src/slices/cli/cli-output.ts +++ b/redisinsight/ui/src/slices/cli/cli-output.ts @@ -1,16 +1,19 @@ import { createSlice } from '@reduxjs/toolkit' -import { CliOutputFormatterType, cliTexts } from 'uiSrc/constants/cliOutput' +import { CliOutputFormatterType, cliTexts, ConnectionSuccessOutputText, SelectCommand } from 'uiSrc/constants/cliOutput' import { apiService, localStorageService } from 'uiSrc/services' -import { ApiEndpoints, BrowserStorageItem } from 'uiSrc/constants' +import { ApiEndpoints, BrowserStorageItem, CommandMonitor } from 'uiSrc/constants' import { - cliCommandOutput, cliParseTextResponseWithOffset, - cliParseTextResponseWithRedirect, + cliParseTextResponseWithRedirect, getDbIndexFromSelectQuery, } from 'uiSrc/utils/cliHelper' -import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils' +import { getApiErrorMessage, getApiErrorName, getUrl, isStatusSuccessful } from 'uiSrc/utils' +import { cliUnsupportedCommandsSelector, updateCliClientAction } from 'uiSrc/slices/cli/cli-settings' +import ApiErrors from 'uiSrc/constants/apiErrors' + import { SendClusterCommandDto, SendClusterCommandResponse, SendCommandResponse, } from 'apiSrc/modules/cli/dto/cli.dto' +import { showMonitor } from './monitor' import { AppDispatch, RootState } from '../store' import { CommandExecutionStatus, StateCliOutput } from '../interfaces/cli' @@ -18,6 +21,7 @@ export const initialState: StateCliOutput = { data: [], loading: false, error: '', + db: 0, commandHistory: localStorageService?.get(BrowserStorageItem.cliInputHistory) ?? [], } @@ -56,10 +60,13 @@ const outputSlice = createSlice({ state.data = [] state.loading = false }, - resetOutputLoading: (state) => { state.loading = false }, + + setCliDbIndex: (state, { payload }) => { + state.db = payload + }, }, }) @@ -73,6 +80,7 @@ export const { sendCliCommand, sendCliCommandSuccess, sendCliCommandFailure, + setCliDbIndex, } = outputSlice.actions // A selector @@ -88,11 +96,12 @@ export function sendCliCommandAction( onFailAction?: () => void ) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { + let cliClientUuid try { const state = stateInit() + cliClientUuid = state?.cli?.settings?.cliClientUuid const { id = '' } = state.connections?.instances?.connectedInstance - dispatch(concatToOutput(cliCommandOutput(command))) if (command === '') { onSuccessAction?.() return @@ -109,13 +118,30 @@ export function sendCliCommandAction( onSuccessAction?.() dispatch(sendCliCommandSuccess()) dispatch(concatToOutput(cliParseTextResponseWithOffset(response, command, dataStatus))) + if ( + dataStatus === CommandExecutionStatus.Success + && command.toLowerCase().startsWith(SelectCommand.toLowerCase()) + ) { + try { + const dbIndex = getDbIndexFromSelectQuery(command) + dispatch(setCliDbIndex(dbIndex)) + } catch (e) { + // continue regardless of error + } + } } } catch (error) { const errorMessage = getApiErrorMessage(error) + const errorName = getApiErrorName(error) dispatch(sendCliCommandFailure(errorMessage)) - dispatch( - concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)) - ) + + if (errorName === ApiErrors.ClientNotFound && cliClientUuid) { + handleRecreateClient(dispatch, stateInit) + } else { + dispatch( + concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)) + ) + } onFailAction?.() } } @@ -129,12 +155,13 @@ export function sendCliClusterCommandAction( onFailAction?: () => void ) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { + let cliClientUuid try { const outputFormat = CliOutputFormatterType.Raw const state = stateInit() + cliClientUuid = state?.cli?.settings?.cliClientUuid const { id = '' } = state.connections.instances?.connectedInstance - dispatch(concatToOutput(cliCommandOutput(command))) if (command === '') { onSuccessAction?.() return @@ -174,10 +201,16 @@ export function sendCliClusterCommandAction( } } catch (error) { const errorMessage = getApiErrorMessage(error) + const errorName = getApiErrorName(error) dispatch(sendCliCommandFailure(errorMessage)) - dispatch( - concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)) - ) + + if (errorName === ApiErrors.ClientNotFound && cliClientUuid) { + handleRecreateClient(dispatch, stateInit) + } else { + dispatch( + concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)) + ) + } onFailAction?.() } } @@ -190,10 +223,9 @@ export function processUnsupportedCommand( ) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { const state = stateInit() - const { unsupportedCommands } = state.cli.settings - - dispatch(concatToOutput(cliCommandOutput(command))) - + // Due to requirements, the monitor command should not appear in the list of supported commands + // That is why we exclude it here + const unsupportedCommands = cliUnsupportedCommandsSelector(state, [CommandMonitor.toLowerCase()]) dispatch( concatToOutput( cliParseTextResponseWithOffset( @@ -210,3 +242,60 @@ export function processUnsupportedCommand( onSuccessAction?.() } } + +export function processUnrepeatableNumber( + command: string = '', + onSuccessAction?: () => void +) { + return async (dispatch: AppDispatch) => { + dispatch( + concatToOutput( + cliParseTextResponseWithOffset( + cliTexts.REPEAT_COUNT_INVALID, + command, + CommandExecutionStatus.Fail + ) + ) + ) + + onSuccessAction?.() + } +} + +export function processMonitorCommand( + command: string = '', + onSuccessAction?: () => void +) { + return async (dispatch: AppDispatch) => { + dispatch(showMonitor()) + + dispatch( + concatToOutput( + cliParseTextResponseWithOffset( + cliTexts.MONITOR_COMMAND, + command, + CommandExecutionStatus.Fail + ) + ) + ) + + onSuccessAction?.() + } +} + +function handleRecreateClient(dispatch: AppDispatch, stateInit: () => RootState, command = ''): void { + const state = stateInit() + const { cliClientUuid } = state.cli.settings + if (cliClientUuid) { + dispatch(concatToOutput( + cliParseTextResponseWithOffset(cliTexts.CONNECTION_CLOSED, command, CommandExecutionStatus.Fail) + )) + dispatch(updateCliClientAction( + cliClientUuid, + () => dispatch(concatToOutput(ConnectionSuccessOutputText)), + (message:string) => dispatch(concatToOutput( + cliParseTextResponseWithOffset(`${message}`, command, CommandExecutionStatus.Fail) + )), + )) + } +} diff --git a/redisinsight/ui/src/slices/cli/cli-settings.ts b/redisinsight/ui/src/slices/cli/cli-settings.ts index a316c41207..225e46a6a3 100644 --- a/redisinsight/ui/src/slices/cli/cli-settings.ts +++ b/redisinsight/ui/src/slices/cli/cli-settings.ts @@ -1,8 +1,12 @@ import { createSlice } from '@reduxjs/toolkit' + +import { CreateCliClientResponse, DeleteClientResponse } from 'apiSrc/modules/cli/dto/cli.dto' import { apiService, sessionStorageService } from 'uiSrc/services' import { ApiEndpoints, BrowserStorageItem } from 'uiSrc/constants' import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils' -import { CreateCliClientResponse, DeleteClientResponse } from 'apiSrc/modules/cli/dto/cli.dto' +import { concatToOutput, setCliDbIndex } from 'uiSrc/slices/cli/cli-output' +import { cliTexts, ConnectionSuccessOutputText, InitOutputText } from 'uiSrc/constants/cliOutput' +import { connectedInstanceSelector } from 'uiSrc/slices/instances' import { AppDispatch, RootState } from '../store' import { StateCliSettings } from '../interfaces/cli' @@ -158,6 +162,8 @@ export const { // A selector export const cliSettingsSelector = (state: RootState) => state.cli.settings +export const cliUnsupportedCommandsSelector = (state: RootState, exclude: string[] = []): string[] => + state.cli.settings.unsupportedCommands.filter((command: string) => !exclude.includes(command.toLowerCase())) // The reducer export default cliSettingsSlice.reducer @@ -168,10 +174,12 @@ export function createCliClientAction( onFailAction?: (message: string) => void ) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { + const state = stateInit() + const { host, port, db } = connectedInstanceSelector(state) dispatch(processCliClient()) + dispatch(concatToOutput(InitOutputText(host, port, db))) try { - const state = stateInit() const { data, status } = await apiService.post( getUrl(state.connections.instances.connectedInstance?.id ?? '', ApiEndpoints.CLI) ) @@ -179,12 +187,15 @@ export function createCliClientAction( if (isStatusSuccessful(status)) { sessionStorageService.set(BrowserStorageItem.cliClientUuid, data?.uuid) dispatch(processCliClientSuccess(data?.uuid)) + dispatch(concatToOutput(ConnectionSuccessOutputText)) + dispatch(setCliDbIndex(state.connections?.instances?.connectedInstance?.db || 0)) onSuccessAction?.() } } catch (error) { const errorMessage = getApiErrorMessage(error) dispatch(processCliClientFailure(errorMessage)) + dispatch(concatToOutput(cliTexts.CLI_ERROR_MESSAGE(errorMessage))) onFailAction?.(errorMessage) } } @@ -207,6 +218,7 @@ export function updateCliClientAction( if (isStatusSuccessful(status)) { dispatch(processCliClientSuccess(data?.uuid)) + dispatch(setCliDbIndex(state.connections?.instances?.connectedInstance?.db || 0)) onSuccessAction?.() } } catch (error) { diff --git a/redisinsight/ui/src/slices/cli/monitor.ts b/redisinsight/ui/src/slices/cli/monitor.ts new file mode 100644 index 0000000000..8786f65a0f --- /dev/null +++ b/redisinsight/ui/src/slices/cli/monitor.ts @@ -0,0 +1,96 @@ +import { createSlice } from '@reduxjs/toolkit' + +import { IMonitorDataPayload, StateMonitor } from '../interfaces' +import { RootState } from '../store' + +export const initialState: StateMonitor = { + isShowMonitor: false, + isRunning: false, + isStarted: false, + isMinimizedMonitor: false, + socket: null, + error: '', + items: [], +} + +export const MONITOR_ITEMS_MAX_COUNT = 5_000 + +// A slice for recipes +const monitorSlice = createSlice({ + name: 'monitor', + initialState, + reducers: { + setMonitorInitialState: (state) => { + state.socket?.removeAllListeners() + state.socket?.disconnect() + return { ...initialState } + }, + // collapse / uncollapse Monitor + toggleMonitor: (state) => { + state.isShowMonitor = !state.isShowMonitor + state.isMinimizedMonitor = !state.isMinimizedMonitor + }, + + // uncollapse Monitor + showMonitor: (state) => { + state.isShowMonitor = true + }, + + // hide / unhide CLI Helper + toggleHideMonitor: (state) => { + state.isMinimizedMonitor = !state.isMinimizedMonitor + }, + + setSocket: (state, { payload }) => { + state.socket = payload + state.isStarted = true + }, + + toggleRunMonitor: (state) => { + state.isRunning = !state.isRunning + }, + + stopMonitor: (state) => { + state.isRunning = false + }, + + concatMonitorItems: (state, { payload }: { payload: IMonitorDataPayload[] }) => { + // small optimization to not unnecessary concat big arrays since we know max logs to show limitations + if (payload.length >= MONITOR_ITEMS_MAX_COUNT) { + state.items = [...payload.slice(-MONITOR_ITEMS_MAX_COUNT)] + return + } + + let newItems = [...state.items, ...payload] + + if (newItems.length > MONITOR_ITEMS_MAX_COUNT) { + newItems = newItems.slice(newItems.length - MONITOR_ITEMS_MAX_COUNT) + } + + state.items = newItems + }, + + resetMonitorItems: (state) => { + state.items = [] + }, + }, +}) + +// Actions generated from the slice +export const { + setMonitorInitialState, + showMonitor, + toggleMonitor, + toggleHideMonitor, + setSocket, + toggleRunMonitor, + stopMonitor, + concatMonitorItems, + resetMonitorItems, +} = monitorSlice.actions + +// A selector +export const monitorSelector = (state: RootState) => state.cli.monitor + +// The reducer +export default monitorSlice.reducer diff --git a/redisinsight/ui/src/slices/instances.ts b/redisinsight/ui/src/slices/instances.ts index dc5b9fbc18..21ab3db744 100644 --- a/redisinsight/ui/src/slices/instances.ts +++ b/redisinsight/ui/src/slices/instances.ts @@ -35,13 +35,6 @@ export const initialState: InitialStateInstances = { }, instanceOverview: { version: '', - totalKeys: 0, - usedMemory: 0, - connectedClients: 0, - opsPerSecond: 0, - networkInKbps: 0, - networkOutKbps: 0, - cpuUsagePercentage: null }, } @@ -122,7 +115,7 @@ const instancesSlice = createSlice({ getDatabaseConfigInfoSuccess: (state, { payload }) => { state.loading = false state.instanceOverview = { - ...state.instanceOverview, + version: state.instanceOverview.version, ...payload } }, diff --git a/redisinsight/ui/src/slices/interfaces/api.ts b/redisinsight/ui/src/slices/interfaces/api.ts new file mode 100644 index 0000000000..c61e8d9c32 --- /dev/null +++ b/redisinsight/ui/src/slices/interfaces/api.ts @@ -0,0 +1,13 @@ +import { CreateCommandExecutionDto as CreateCommandExecutionDtoAPI } from 'apiSrc/modules/workbench/dto/create-command-execution.dto' +import { CommandExecution as CommandExecutionAPI } from 'apiSrc/modules/workbench/models/command-execution' +import { CommandExecutionResult as CommandExecutionResultAPI } from 'apiSrc/modules/workbench/models/command-execution-result' + +interface CreateCommandExecutionDto extends CreateCommandExecutionDtoAPI {} +interface CommandExecution extends CommandExecutionAPI {} +interface CommandExecutionResult extends CommandExecutionResultAPI {} + +export { + CommandExecution, + CommandExecutionResult, + CreateCommandExecutionDto +} diff --git a/redisinsight/ui/src/slices/interfaces/app.ts b/redisinsight/ui/src/slices/interfaces/app.ts index 2d5f71f206..7c0269d42f 100644 --- a/redisinsight/ui/src/slices/interfaces/app.ts +++ b/redisinsight/ui/src/slices/interfaces/app.ts @@ -85,7 +85,7 @@ export interface PluginsResponse { export interface IPlugin { name: string; main: string; - styles: string[]; + styles: string | string[]; baseUrl: string; visualizations: any[]; internal?: boolean; diff --git a/redisinsight/ui/src/slices/interfaces/cli.ts b/redisinsight/ui/src/slices/interfaces/cli.ts index 9c1465d2f0..4000075c90 100644 --- a/redisinsight/ui/src/slices/interfaces/cli.ts +++ b/redisinsight/ui/src/slices/interfaces/cli.ts @@ -31,4 +31,5 @@ export interface StateCliOutput { commandHistory: string[]; loading: boolean; error: string; + db: number; } diff --git a/redisinsight/ui/src/slices/interfaces/index.ts b/redisinsight/ui/src/slices/interfaces/index.ts index 66d612e485..377bdae85f 100644 --- a/redisinsight/ui/src/slices/interfaces/index.ts +++ b/redisinsight/ui/src/slices/interfaces/index.ts @@ -2,3 +2,5 @@ export * from './instances' export * from './hash' export * from './app' export * from './workbench' +export * from './monitor' +export * from './api' diff --git a/redisinsight/ui/src/slices/interfaces/instances.ts b/redisinsight/ui/src/slices/interfaces/instances.ts index 925c9d446d..e467899ec0 100644 --- a/redisinsight/ui/src/slices/interfaces/instances.ts +++ b/redisinsight/ui/src/slices/interfaces/instances.ts @@ -223,13 +223,13 @@ export interface RedisCloudSubscription { export interface DatabaseConfigInfo { version: string; - totalKeys: Nullable; - usedMemory: Nullable; - connectedClients: Nullable; - opsPerSecond: Nullable; - networkInKbps: Nullable; - networkOutKbps: Nullable; - cpuUsagePercentage: Nullable; + totalKeys?: Nullable; + usedMemory?: Nullable; + connectedClients?: Nullable; + opsPerSecond?: Nullable; + networkInKbps?: Nullable; + networkOutKbps?: Nullable; + cpuUsagePercentage?: Nullable; } export interface InitialStateInstances { diff --git a/redisinsight/ui/src/slices/interfaces/monitor.ts b/redisinsight/ui/src/slices/interfaces/monitor.ts new file mode 100644 index 0000000000..10586233ef --- /dev/null +++ b/redisinsight/ui/src/slices/interfaces/monitor.ts @@ -0,0 +1,18 @@ +import { Socket } from 'socket.io-client' +import { Nullable } from 'uiSrc/utils' +import { IOnDatePayload } from 'apiSrc/modules/monitor/helpers/client-monitor-observer' + +export interface IMonitorDataPayload extends Partial{ + isError?: boolean + message?: string +} + +export interface StateMonitor { + isShowMonitor: boolean + isMinimizedMonitor: boolean + isRunning: boolean + isStarted: boolean + socket: Nullable + items: IMonitorDataPayload[] + error: string +} diff --git a/redisinsight/ui/src/slices/interfaces/workbench.ts b/redisinsight/ui/src/slices/interfaces/workbench.ts index ff786c27ce..244107fcd8 100644 --- a/redisinsight/ui/src/slices/interfaces/workbench.ts +++ b/redisinsight/ui/src/slices/interfaces/workbench.ts @@ -1,3 +1,5 @@ +import { CommandExecution } from './api' + export interface StateWorkbenchSettings { wbClientUuid: string; loading: boolean; @@ -7,9 +9,9 @@ export interface StateWorkbenchSettings { } export interface StateWorkbenchResults { - loading: boolean; - error: string; - commandHistory: string[]; + loading: boolean + error: string + items: CommandExecutionUI[] } export enum EnablementAreaComponent { @@ -31,3 +33,9 @@ export interface StateWorkbenchEnablementArea { error: string; items: Record; } + +export interface CommandExecutionUI extends Partial { + loading?: boolean + isOpen?: boolean + error?: string +} diff --git a/redisinsight/ui/src/slices/store.ts b/redisinsight/ui/src/slices/store.ts index 8ce1c00245..c9075ce492 100644 --- a/redisinsight/ui/src/slices/store.ts +++ b/redisinsight/ui/src/slices/store.ts @@ -17,12 +17,12 @@ import rejsonReducer from './rejson' import notificationsReducer from './app/notifications' import cliSettingsReducer from './cli/cli-settings' import outputReducer from './cli/cli-output' +import monitorReducer from './cli/monitor' import userSettingsReducer from './user/user-settings' import appInfoReducer from './app/info' import appContextReducer from './app/context' import appRedisCommandsReducer from './app/redis-commands' import appPluginsReducer from './app/plugins' -import workbenchSettingsReducer from './workbench/wb-settings' import workbenchResultsReducer from './workbench/wb-results' import workbenchEnablementAreaReducer from './workbench/wb-enablement-area' @@ -56,12 +56,12 @@ export const rootReducer = combineReducers({ cli: combineReducers({ settings: cliSettingsReducer, output: outputReducer, + monitor: monitorReducer, }), user: combineReducers({ settings: userSettingsReducer, }), workbench: combineReducers({ - settings: workbenchSettingsReducer, results: workbenchResultsReducer, enablementArea: workbenchEnablementAreaReducer, }), diff --git a/redisinsight/ui/src/slices/tests/app/plugins.spec.ts b/redisinsight/ui/src/slices/tests/app/plugins.spec.ts new file mode 100644 index 0000000000..6fc643b633 --- /dev/null +++ b/redisinsight/ui/src/slices/tests/app/plugins.spec.ts @@ -0,0 +1,137 @@ +import { cloneDeep, flatMap, isEmpty, reject } from 'lodash' +import { cleanup, initialStateDefault, mockedStore } from 'uiSrc/utils/test-utils' +import { IPlugin, PluginsResponse } from 'uiSrc/slices/interfaces' +import reducer, { + appPluginsSelector, + getAllPlugins, getAllPluginsFailure, getAllPluginsSuccess, + initialState, +} from '../../app/plugins' + +let store: typeof mockedStore +beforeEach(() => { + cleanup() + store = cloneDeep(mockedStore) + store.clearActions() +}) + +const MOCK_PLUGINS_RESPONSE = { + static: '/static/resources/plugins', + plugins: [ + { + styles: '/static/plugins/redisearch/dist/styles.css', + main: '/static/plugins/redisearch/dist/index.js', + name: 'redisearch', + visualizations: [ + { + id: 'redisearch', + name: 'Table', + activationMethod: 'renderRediSearch', + matchCommands: [ + 'FT.INFO', + 'FT.SEARCH', + 'FT.AGGREGATE' + ], + iconDark: './dist/table_view_icon_dark.svg', + iconLight: './dist/table_view_icon_light.svg', + default: true + } + ], + internal: true, + baseUrl: '/static/plugins/redisearch/' + } + ] +} + +describe('slices', () => { + describe('reducer, actions and selectors', () => { + it('should return the initial state on first run', () => { + // Arrange + const nextState = initialState + + // Act + const result = reducer(undefined, {}) + + // Assert + expect(result).toEqual(nextState) + }) + }) + + describe('getAllPlugins', () => { + it('should properly set loading', () => { + // Arrange + const loading = true + const state = { + ...initialState, + loading + } + + // Act + const nextState = reducer(initialState, getAllPlugins()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + app: { plugins: nextState }, + }) + + expect(appPluginsSelector(rootState)).toEqual(state) + }) + }) + + describe('getAllPluginsSuccess', () => { + it('should properly set state after success', () => { + // Arrange + const data: PluginsResponse = MOCK_PLUGINS_RESPONSE + const state = { + ...initialState, + staticPath: data.static, + plugins: reject(data?.plugins, isEmpty), + visualizations: flatMap( + reject(data?.plugins, isEmpty), + (plugin: IPlugin) => plugin.visualizations.map((view) => ({ + ...view, + plugin: { + name: plugin.name, + baseUrl: plugin.baseUrl, + internal: plugin.internal, + stylesSrc: plugin.styles, + scriptSrc: plugin.main + }, + uniqId: `${plugin.name}__${view.id}` + })) + ) + } + + // Act + const nextState = reducer(initialState, getAllPluginsSuccess(data)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + app: { plugins: nextState }, + }) + + expect(appPluginsSelector(rootState)).toEqual(state) + }) + }) + + describe('getAllPluginsFailure', () => { + it('should properly set error', () => { + // Arrange + const error = 'error' + const state = { + ...initialState, + loading: false, + error + } + + // Act + const nextState = reducer(initialState, getAllPluginsFailure(error)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + app: { plugins: nextState }, + }) + + expect(appPluginsSelector(rootState)).toEqual(state) + }) + }) +}) diff --git a/redisinsight/ui/src/slices/tests/cli/cli-output.spec.ts b/redisinsight/ui/src/slices/tests/cli/cli-output.spec.ts index b9ec78d88c..71b0cefa88 100644 --- a/redisinsight/ui/src/slices/tests/cli/cli-output.spec.ts +++ b/redisinsight/ui/src/slices/tests/cli/cli-output.spec.ts @@ -1,35 +1,34 @@ import { SendClusterCommandDto, SendClusterCommandResponse } from 'apiSrc/modules/cli/dto/cli.dto' import { cloneDeep, first } from 'lodash' -import { - cleanup, - mockedStore, - initialStateDefault, - clearStoreActions, - mockStore, -} from 'uiSrc/utils/test-utils' +import { AppDispatch, RootState } from 'uiSrc/slices/store' +import { cleanup, clearStoreActions, initialStateDefault, mockedStore, mockStore, } from 'uiSrc/utils/test-utils' import { ClusterNodeRole, CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' import { apiService } from 'uiSrc/services' import { cliTexts } from 'uiSrc/constants/cliOutput' -import { - cliCommandOutput, - cliParseTextResponseWithOffset, - cliParseTextResponseWithRedirect -} from 'uiSrc/utils/cliHelper' +import { cliParseTextResponseWithOffset, cliParseTextResponseWithRedirect } from 'uiSrc/utils/cliHelper' +import ApiErrors from 'uiSrc/constants/apiErrors' +import { updateCliClientAction } from 'uiSrc/slices/cli/cli-settings' import reducer, { - initialState, concatToOutput, - sendCliCommand, - sendCliCommandSuccess, - sendCliCommandFailure, - sendCliCommandAction, - sendCliClusterCommandAction, + initialState, outputSelector, processUnsupportedCommand, + sendCliClusterCommandAction, + sendCliCommand, + sendCliCommandAction, + sendCliCommandFailure, + sendCliCommandSuccess, + setCliDbIndex, updateCliCommandHistory, } from '../../cli/cli-output' jest.mock('uiSrc/services') +jest.mock('uiSrc/slices/cli/cli-settings', () => ({ + ...jest.requireActual('uiSrc/slices/cli/cli-settings'), + updateCliClientAction: jest.fn() + .mockImplementation((_dispatch: AppDispatch, stateInit: () => RootState) => stateInit()) +})) let store: typeof mockedStore beforeEach(() => { @@ -177,7 +176,6 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), concatToOutput( cliParseTextResponseWithOffset( cliTexts.CLI_UNSUPPORTED_COMMANDS(command, unsupportedCommands.join(', ')), @@ -192,6 +190,25 @@ describe('cliOutput slice', () => { }) }) + describe('setCliDbIndex', () => { + it('should set correct value', () => { + // Arrange + const db = 1 + const state: typeof initialState = { ...initialState, db } + + // Act + const nextState = reducer(initialState, setCliDbIndex(db)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + output: nextState, + }, + }) + expect(outputSelector(rootState)).toEqual(state) + }) + }) + describe('thunks', () => { describe('Standalone Cli command', () => { it('call both sendCliStandaloneCommandAction and sendCliCommandSuccess when response status is successed', async () => { @@ -210,7 +227,49 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), + sendCliCommand(), + sendCliCommandSuccess(), + concatToOutput(cliParseTextResponseWithOffset(data.response, command, data.status)), + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call setCliDbIndex when response status is successed', async () => { + // Arrange + const dbIndex = 1 + const command = `SELECT ${dbIndex}` + const data = { response: 'OK', status: CommandExecutionStatus.Success } + const responsePayload = { data, status: 200 } + + apiService.post = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(sendCliCommandAction(command)) + + // Assert + const expectedActions = [ + sendCliCommand(), + sendCliCommandSuccess(), + concatToOutput(cliParseTextResponseWithOffset(data.response, command, data.status)), + setCliDbIndex(dbIndex) + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('should not call setCliDbIndex when response status is failed', async () => { + // Arrange + const dbIndex = 1 + const command = `SELECT ${dbIndex}` + const data = { response: 'OK', status: CommandExecutionStatus.Fail } + const responsePayload = { data, status: 200 } + + apiService.post = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(sendCliCommandAction(command)) + + // Assert + const expectedActions = [ sendCliCommand(), sendCliCommandSuccess(), concatToOutput(cliParseTextResponseWithOffset(data.response, command, data.status)), @@ -234,7 +293,6 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), sendCliCommand(), sendCliCommandSuccess(), concatToOutput(cliParseTextResponseWithOffset(data.response, command, data.status)), @@ -261,13 +319,45 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), sendCliCommand(), sendCliCommandFailure(responsePayload.response.data.message), concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)), ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) + + it('call both updateCliClientAction on ClientNotFound error', async () => { + // Arrange + const command = 'keys *' + const errorMessage = cliTexts.CONNECTION_CLOSED + const responsePayload = { + response: { + status: 404, + data: { message: errorMessage, name: ApiErrors.ClientNotFound }, + }, + } + apiService.post = jest.fn().mockRejectedValueOnce(responsePayload) + const rootState = Object.assign(initialStateDefault, { + cli: { + settings: { ...initialStateDefault.cli.settings, cliClientUuid: '123' }, + }, + }) + const tempStore = mockStore(rootState) + + // Act + await tempStore.dispatch(sendCliCommandAction(command)) + + // Assert + const expectedActions = [ + sendCliCommand(), + sendCliCommandFailure(responsePayload.response.data.message), + concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)), + concatToOutput(['\n']), + concatToOutput(['\n']) + ] + expect(updateCliClientAction).toHaveBeenCalled() + expect(clearStoreActions(tempStore.getActions())).toEqual(clearStoreActions(expectedActions)) + }) }) describe('Single Node Cluster Cli command', () => { @@ -287,7 +377,7 @@ describe('cliOutput slice', () => { const data: SendClusterCommandResponse[] = [ { response: '(nil)', - status: 'success', + status: CommandExecutionStatus.Success, node: { host: '127.0.0.1', port: 7002, slot: 6918 }, }, ] @@ -300,7 +390,6 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), sendCliCommand(), sendCliCommandSuccess(), concatToOutput( @@ -318,7 +407,7 @@ describe('cliOutput slice', () => { const data: SendClusterCommandResponse[] = [ { response: null, - status: 'success', + status: CommandExecutionStatus.Success, node: { host: '127.0.0.1', port: 7002, slot: 6918 }, }, ] @@ -331,7 +420,6 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), sendCliCommand(), sendCliCommandSuccess(), concatToOutput( @@ -361,13 +449,45 @@ describe('cliOutput slice', () => { // Assert const expectedActions = [ - concatToOutput(cliCommandOutput(command)), sendCliCommand(), sendCliCommandFailure(responsePayload.response.data.message), concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)), ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) + + it('call both updateCliClientAction on ClientNotFound error', async () => { + // Arrange + const command = 'keys *' + const errorMessage = cliTexts.CONNECTION_CLOSED + const responsePayload = { + response: { + status: 404, + data: { message: errorMessage, name: ApiErrors.ClientNotFound }, + }, + } + apiService.post = jest.fn().mockRejectedValueOnce(responsePayload) + const rootState = Object.assign(initialStateDefault, { + cli: { + settings: { ...initialStateDefault.cli.settings, cliClientUuid: '123' }, + }, + }) + const tempStore = mockStore(rootState) + + // Act + await tempStore.dispatch(sendCliClusterCommandAction(command, options)) + + // Assert + const expectedActions = [ + sendCliCommand(), + sendCliCommandFailure(responsePayload.response.data.message), + concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)), + concatToOutput(['\n']), + concatToOutput(['\n']) + ] + expect(updateCliClientAction).toHaveBeenCalled() + expect(clearStoreActions(tempStore.getActions())).toEqual(clearStoreActions(expectedActions)) + }) }) }) }) diff --git a/redisinsight/ui/src/slices/tests/cli/cli-settings.spec.ts b/redisinsight/ui/src/slices/tests/cli/cli-settings.spec.ts index 620292110c..5727d3d0f0 100644 --- a/redisinsight/ui/src/slices/tests/cli/cli-settings.spec.ts +++ b/redisinsight/ui/src/slices/tests/cli/cli-settings.spec.ts @@ -1,6 +1,13 @@ import { cloneDeep } from 'lodash' import { apiService } from 'uiSrc/services' -import { cleanup, mockedStore, initialStateDefault } from 'uiSrc/utils/test-utils' +import { cleanup, mockedStore, initialStateDefault, clearStoreActions } from 'uiSrc/utils/test-utils' +import { concatToOutput, setCliDbIndex } from 'uiSrc/slices/cli/cli-output' +import { + cliTexts, + ConnectionSuccessOutputText, + InitOutputText, + mockInitOutputText, +} from 'uiSrc/constants/cliOutput' import reducer, { initialState, toggleCli, @@ -26,6 +33,11 @@ import reducer, { resetCliHelperSettings, } from '../../cli/cli-settings' +jest.mock('uiSrc/constants/cliOutput', () => ({ + ...jest.requireActual('uiSrc/constants/cliOutput'), + InitOutputText: jest.fn().mockReturnValue([]), +})) + let store: typeof mockedStore beforeEach(() => { cleanup() @@ -442,7 +454,10 @@ describe('cliSettings slice', () => { // Assert const expectedActions = [ processCliClient(), + concatToOutput(InitOutputText()), processCliClientSuccess(responsePayload.data?.uuid), + concatToOutput(ConnectionSuccessOutputText), + setCliDbIndex(0) ] expect(store.getActions()).toEqual(expectedActions) }) @@ -465,9 +480,11 @@ describe('cliSettings slice', () => { // Assert const expectedActions = [ processCliClient(), + concatToOutput(InitOutputText()), processCliClientFailure(responsePayload.response.data.message), + concatToOutput(cliTexts.CLI_ERROR_MESSAGE(errorMessage)) ] - expect(store.getActions()).toEqual(expectedActions) + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) it('call both updateCliClientAction and processCliClientSuccess when fetch is successed', async () => { @@ -485,6 +502,7 @@ describe('cliSettings slice', () => { const expectedActions = [ processCliClient(), processCliClientSuccess(responsePayload.data?.uuid), + setCliDbIndex(0) ] expect(store.getActions()).toEqual(expectedActions) }) diff --git a/redisinsight/ui/src/slices/tests/cli/monitor.spec.ts b/redisinsight/ui/src/slices/tests/cli/monitor.spec.ts new file mode 100644 index 0000000000..2ea67c08c5 --- /dev/null +++ b/redisinsight/ui/src/slices/tests/cli/monitor.spec.ts @@ -0,0 +1,245 @@ +/* eslint-disable sonarjs/no-duplicate-string */ +import { cloneDeep } from 'lodash' +import MockedSocket from 'socket.io-mock' +import { cleanup, mockedStore, initialStateDefault } from 'uiSrc/utils/test-utils' +import reducer, { + initialState, + resetMonitorItems, + monitorSelector, + toggleMonitor, + showMonitor, + toggleHideMonitor, + toggleRunMonitor, + setSocket, + concatMonitorItems, + MONITOR_ITEMS_MAX_COUNT, stopMonitor, +} from '../../cli/monitor' + +let store: typeof mockedStore +let socket: typeof MockedSocket +beforeEach(() => { + cleanup() + socket = new MockedSocket() + store = cloneDeep(mockedStore) + store.clearActions() +}) + +describe('monitor slice', () => { + describe('toggleMonitor', () => { + it('default state.isShowMonitor should be falsy', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isShowMonitor: false, + isMinimizedMonitor: false, + } + + expect(monitorSelector(initialStateDefault)).toEqual(state) + }) + + it('should properly set isShowMonitor = true', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isShowMonitor: true, + isMinimizedMonitor: true, + } + + // Act + const nextState = reducer(initialState, toggleMonitor()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('showMonitor', () => { + it('should properly set !isShowMonitor', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isShowMonitor: true, + } + + // Act + const nextState = reducer(initialState, showMonitor()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('toggleHideMonitor', () => { + it('should properly set !isShowMonitor', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isMinimizedMonitor: true, + } + + // Act + const nextState = reducer(initialState, toggleHideMonitor()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('toggleRunMonitor', () => { + it('should properly set !isRunning', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isRunning: true, + } + + // Act + const nextState = reducer(initialState, toggleRunMonitor()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('stopMonitor', () => { + it('should properly set new state', () => { + // Arrange + toggleRunMonitor() + const state: typeof initialState = { + ...initialState, + isRunning: false, + } + + // Act + const nextState = reducer(initialState, stopMonitor()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('setSocket', () => { + it('should properly set setSocket = mockedSocket', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + socket, + isStarted: true + } + + // Act + const nextState = reducer(initialState, setSocket(socket)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('concatMonitorItems', () => { + it('should properly set payload to items', () => { + const payload = [{ + time: '1', + args: ['monitor'], + source: 'source', + database: 0, + shardOptions: { host: '127.0.0.1', port: 6379 } + }, + { + time: '2', + args: ['get'], + source: 'source', + database: 0, + shardOptions: { host: '127.0.0.1', port: 6379 } + }] + + // Arrange + const state: typeof initialState = { + ...initialState, + items: payload + } + + // Act + const nextState = reducer(initialState, concatMonitorItems(payload)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + + it('should properly set items no more than MONITOR_ITEMS_MAX_COUNT', () => { + const payload = new Array(MONITOR_ITEMS_MAX_COUNT + 10) + + // Arrange + const state: typeof initialState = { + ...initialState, + items: new Array(MONITOR_ITEMS_MAX_COUNT) + } + + // Act + const nextState = reducer(initialState, concatMonitorItems(payload)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) + + describe('resetMonitorItems', () => { + it('should properly set isShowMonitor = false', () => { + // Arrange + const state: typeof initialState = { + ...initialState, + isShowMonitor: false, + } + + // Act + const nextState = reducer(initialState, resetMonitorItems()) + + // Assert + const rootState = Object.assign(initialStateDefault, { + cli: { + monitor: nextState, + }, + }) + expect(monitorSelector(rootState)).toEqual(state) + }) + }) +}) diff --git a/redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts b/redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts index 6a47aefe0d..53fe3fa349 100644 --- a/redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts +++ b/redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts @@ -6,21 +6,30 @@ import { mockedStore, initialStateDefault, clearStoreActions, - mockStore, } from 'uiSrc/utils/test-utils' import { apiService } from 'uiSrc/services' import { addErrorNotification } from 'uiSrc/slices/app/notifications' import { ClusterNodeRole, CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' -import { SendClusterCommandDto, SendClusterCommandResponse } from 'apiSrc/modules/cli/dto/cli.dto' +import { SendClusterCommandDto } from 'apiSrc/modules/cli/dto/cli.dto' import reducer, { initialState, sendWBCommand, sendWBCommandSuccess, - sendWBCommandFailure, - updateWBCommandHistory, + processWBCommandFailure, workbenchResultsSelector, sendWBCommandAction, sendWBCommandClusterAction, + fetchWBCommandAction, + deleteWBCommandAction, + loadWBHistory, + loadWBHistorySuccess, + loadWBHistoryFailure, + processWBCommand, + fetchWBCommandSuccess, + toggleOpenWBResult, + deleteWBCommandSuccess, + resetWBHistoryItems, + fetchWBHistoryAction, } from '../../workbench/wb-results' jest.mock('uiSrc/services') @@ -32,18 +41,37 @@ beforeEach(() => { store.clearActions() }) +const mockItemId = '123' +const initialStateWithItems = { + ...initialState, + items: [{ + id: mockItemId + }] +} + describe('workbench results slice', () => { - describe('updateWBCommandHistory', () => { - it('should properly updated cli history output', () => { - const data = ['lalal', 'tatata'] + describe('sendWBCommand', () => { + it('should properly set loading = true, isOpen = true, error = ""', () => { // Arrange - const state: typeof initialState = { + const mockPayload = { + command: 'command', + commandId: '123' + } + const state = { ...initialState, - commandHistory: data, + items: [ + { + command: mockPayload.command, + id: mockPayload.commandId, + loading: true, + isOpen: true, + error: '' + } + ] } // Act - const nextState = reducer(initialState, updateWBCommandHistory(data)) + const nextState = reducer(initialState, sendWBCommand(mockPayload)) // Assert const rootState = Object.assign(initialStateDefault, { @@ -55,16 +83,43 @@ describe('workbench results slice', () => { }) }) - describe('sendWBCommand', () => { - it('should properly set loading = true', () => { + describe('toggleOpenWBResult', () => { + it('should properly set isOpen = true', () => { // Arrange + const state = { - ...initialState, - loading: true, + ...initialStateWithItems, + items: [ + { + ...initialStateWithItems.items[0], + isOpen: true + } + ] + } + + // Act + const nextState = reducer(initialStateWithItems, toggleOpenWBResult(mockItemId)) + + // Assert + const rootState = Object.assign(initialStateDefault, { + workbench: { + results: nextState, + }, + }) + expect(workbenchResultsSelector(rootState)).toEqual(state) + }) + }) + describe('resetWBHistoryItems', () => { + it('should properly remove all items', () => { + // Arrange + + const state = { + ...initialStateWithItems, + items: [] } // Act - const nextState = reducer(initialState, sendWBCommand()) + const nextState = reducer(initialStateWithItems, resetWBHistoryItems()) // Assert const rootState = Object.assign(initialStateDefault, { @@ -80,13 +135,32 @@ describe('workbench results slice', () => { it('should properly set the state with fetched data', () => { // Arrange + const mockedId = '123' + + const mockCommandExecution = { + commandId: '123', + data: { + command: 'command', + databaseId: '123', + id: mockedId, + createdAt: new Date(), + isOpen: true, + error: '', + loading: false, + result: [{ + response: 'test', + status: CommandExecutionStatus.Success + }] + } + } + const state = { ...initialState, - loading: false, + items: [{ ...mockCommandExecution.data }] } // Act - const nextState = reducer(initialState, sendWBCommandSuccess()) + const nextState = reducer(initialStateWithItems, sendWBCommandSuccess(mockCommandExecution)) // Assert const rootState = Object.assign(initialStateDefault, { @@ -98,18 +172,26 @@ describe('workbench results slice', () => { }) }) - describe('sendWBCommandFailure', () => { + describe('processWBCommandFailure', () => { it('should properly set the error', () => { // Arrange - const data = 'some error' - const state = { - ...initialState, - loading: false, + const data = 'error' + const mockCommandExecution = { + id: mockItemId, error: data, + loading: false, + } + const state = { + ...initialStateWithItems, + items: [ + { + ...mockCommandExecution + } + ] } // Act - const nextState = reducer(initialState, sendWBCommandFailure(data)) + const nextState = reducer(initialStateWithItems, processWBCommandFailure(mockCommandExecution)) // Assert const rootState = Object.assign(initialStateDefault, { @@ -123,48 +205,69 @@ describe('workbench results slice', () => { describe('thunks', () => { describe('Standalone Cli command', () => { - it('call both sendCliStandaloneCommandAction and sendWBCommandSuccess when response status is successed', async () => { + it('call both sendWBCommandAction and sendWBCommandSuccess when response status is successed', async () => { // Arrange const command = 'keys *' + const commandId = `${Date.now()}` const data = { - response: 'tatata', - status: CommandExecutionStatus.Success, + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Success + }] } const responsePayload = { data, status: 200 } apiService.post = jest.fn().mockResolvedValue(responsePayload) // Act - await store.dispatch(sendWBCommandAction(command, Date.now())) + await store.dispatch(sendWBCommandAction({ command, commandId })) // Assert - const expectedActions = [sendWBCommand(), sendWBCommandSuccess()] + const expectedActions = [ + sendWBCommand({ command, commandId }), + sendWBCommandSuccess({ data, commandId }) + ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) - it('call both sendCliStandaloneCommandAction and sendWBCommandSuccess when response status is fail', async () => { + it('call both sendWBCommandAction and sendWBCommandSuccess when response status is fail', async () => { // Arrange const command = 'keys *' + const commandId = `${Date.now()}` const data = { - response: '(err) tatata', - status: CommandExecutionStatus.Fail, + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Fail + }] } const responsePayload = { data, status: 200 } apiService.post = jest.fn().mockResolvedValue(responsePayload) // Act - await store.dispatch(sendWBCommandAction(command, Date.now())) + await store.dispatch(sendWBCommandAction({ command, commandId })) // Assert - const expectedActions = [sendWBCommand(), sendWBCommandSuccess()] + const expectedActions = [ + sendWBCommand({ command, commandId }), + sendWBCommandSuccess({ data, commandId }) + ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) - it('call both sendCliStandaloneCommandAction and sendWBCommandFailure when fetch is fail', async () => { + it('call both sendWBCommandAction and processWBCommandFailure when fetch is fail', async () => { // Arrange const command = 'keys *' + const commandId = `${Date.now()}` const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' const responsePayload = { response: { @@ -176,19 +279,20 @@ describe('workbench results slice', () => { apiService.post = jest.fn().mockRejectedValueOnce(responsePayload) // Act - await store.dispatch(sendWBCommandAction(command, Date.now())) + await store.dispatch(sendWBCommandAction({ command, commandId })) // Assert const expectedActions = [ - sendWBCommand(), + sendWBCommand({ command, commandId }), addErrorNotification(responsePayload as AxiosError), - sendWBCommandFailure(responsePayload.response.data.message), + processWBCommandFailure({ command, error: responsePayload.response.data.message }), ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) }) describe('Single Node Cluster Cli command', () => { + const commandId = `${Date.now()}` const options: SendClusterCommandDto = { command: 'keys *', nodeOptions: { @@ -202,48 +306,60 @@ describe('workbench results slice', () => { it('call both sendWBCommandClusterAction and sendWBCommandSuccess when response status is successed', async () => { // Arrange const command = 'keys *' - const data: SendClusterCommandResponse[] = [ - { - response: '-> Redirected to slot [6918] located at 127.0.0.1:7002\n(nil)', - status: 'success', - node: { host: '127.0.0.1', port: 7002 }, - }, - ] + const data = { + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Success + }] + } const responsePayload = { data, status: 200 } apiService.post = jest.fn().mockResolvedValue(responsePayload) // Act - await store.dispatch(sendWBCommandClusterAction(command, Date.now(), options)) + await store.dispatch(sendWBCommandClusterAction({ command, commandId, options })) // Assert - const expectedActions = [sendWBCommand(), sendWBCommandSuccess()] + const expectedActions = [ + sendWBCommand({ command, commandId }), + sendWBCommandSuccess({ data, commandId }) + ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) it('call both sendWBCommandClusterAction and sendWBCommandSuccess when response status is fail', async () => { // Arrange const command = 'keys *' - const data: SendClusterCommandResponse[] = [ - { - response: '-> Redirected to slot [6918] located at 127.0.0.1:7002\n(nil)', - status: 'success', - node: { host: '127.0.0.1', port: 7002 }, - }, - ] + const data = { + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Fail + }] + } const responsePayload = { data, status: 200 } apiService.post = jest.fn().mockResolvedValue(responsePayload) // Act - await store.dispatch(sendWBCommandClusterAction(command, Date.now(), options)) + await store.dispatch(sendWBCommandClusterAction({ command, options, commandId })) // Assert - const expectedActions = [sendWBCommand(), sendWBCommandSuccess()] + const expectedActions = [ + sendWBCommand({ command, commandId }), + sendWBCommandSuccess({ data, commandId }) + ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) - it('call both sendWBCommandClusterAction and sendWBCommandFailure when fetch is fail', async () => { + it.only('call both sendWBCommandClusterAction and processWBCommandFailure when fetch is fail', async () => { // Arrange const command = 'keys *' const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' @@ -257,13 +373,238 @@ describe('workbench results slice', () => { apiService.post = jest.fn().mockRejectedValueOnce(responsePayload) // Act - await store.dispatch(sendWBCommandClusterAction(command, Date.now(), options)) + await store.dispatch(sendWBCommandAction({ command, options, commandId })) + + // Assert + const expectedActions = [ + sendWBCommand({ command, commandId }), + addErrorNotification(responsePayload as AxiosError), + processWBCommandFailure({ command, error: responsePayload.response.data.message }), + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + }) + + describe('Fetch result for command', () => { + it('call both fetchWBCommandAction and fetchWBCommandSuccess when response status is successed', async () => { + // Arrange + const data = { + command: 'command', + databaseId: '123', + id: mockItemId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Success + }] + } + const responsePayload = { data, status: 200 } + + apiService.get = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(fetchWBCommandAction(mockItemId)) + + // Assert + const expectedActions = [ + processWBCommand(mockItemId), + fetchWBCommandSuccess(data) + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call both fetchWBCommandAction and fetchWBCommandSuccess when response status is fail', async () => { + // Arrange + const commandId = `${Date.now()}` + const data = { + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Fail + }] + } + const responsePayload = { data, status: 200 } + + apiService.get = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(fetchWBCommandAction(commandId)) + + // Assert + const expectedActions = [ + processWBCommand(commandId), + fetchWBCommandSuccess(data) + ] + + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call both fetchWBCommandAction and processWBCommandFailure when fetch is fail', async () => { + // Arrange + const command = 'keys *' + const commandId = `${Date.now()}` + const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' + const responsePayload = { + response: { + status: 500, + data: { message: errorMessage }, + }, + } + + apiService.get = jest.fn().mockRejectedValueOnce(responsePayload) + + // Act + await store.dispatch(fetchWBCommandAction(commandId)) + + // Assert + const expectedActions = [ + processWBCommand(commandId), + addErrorNotification(responsePayload as AxiosError), + processWBCommandFailure({ command, error: responsePayload.response.data.message }), + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + }) + + describe('Delete command from the list', () => { + it('call both deleteWBCommandAction and fetchWBCommandSuccess when response status is successed', async () => { + // Arrange + const data = { + command: 'command', + databaseId: '123', + id: mockItemId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Success + }] + } + const responsePayload = { data, status: 200 } + + apiService.delete = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(deleteWBCommandAction(mockItemId)) + + // Assert + const expectedActions = [ + processWBCommand(mockItemId), + deleteWBCommandSuccess(mockItemId) + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call both deleteWBCommandAction and fetchWBCommandSuccess when response status is fail', async () => { + // Arrange + const commandId = `${Date.now()}` + const data = { + command: 'command', + databaseId: '123', + id: commandId, + createdAt: new Date(), + result: [{ + response: 'test', + status: CommandExecutionStatus.Fail + }] + } + const responsePayload = { data, status: 200 } + + apiService.delete = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(deleteWBCommandAction(commandId)) + + // Assert + const expectedActions = [ + processWBCommand(commandId), + deleteWBCommandSuccess(commandId), + ] + + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call both deleteWBCommandAction and processWBCommandFailure when fetch is fail', async () => { + // Arrange + const command = 'keys *' + const commandId = `${Date.now()}` + const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' + const responsePayload = { + response: { + status: 500, + data: { message: errorMessage }, + }, + } + + apiService.delete = jest.fn().mockRejectedValueOnce(responsePayload) + + // Act + await store.dispatch(deleteWBCommandAction(commandId)) + + // Assert + const expectedActions = [ + processWBCommand(commandId), + addErrorNotification(responsePayload as AxiosError), + processWBCommandFailure({ command, error: responsePayload.response.data.message }), + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + }) + + describe('Fetch list of commands', () => { + it('call both fetchWBHistoryAction and fetchWBCommandSuccess when response status is successed', async () => { + // Arrange + const data = [{ + command: 'command1', + id: '1', + databaseId: '1', + createdAt: new Date(), + result: [], + }, { + id: '2', + command: 'command2', + databaseId: '1', + createdAt: new Date(), + result: [], + }] + const responsePayload = { data, status: 200 } + + apiService.get = jest.fn().mockResolvedValue(responsePayload) + + // Act + await store.dispatch(fetchWBHistoryAction(mockItemId)) + + // Assert + const expectedActions = [ + loadWBHistory(), + loadWBHistorySuccess(data) + ] + expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) + }) + + it('call both fetchWBHistoryAction and processWBCommandFailure when fetch is fail', async () => { + // Arrange + const commandId = `${Date.now()}` + const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' + const responsePayload = { + response: { + status: 500, + data: { message: errorMessage }, + }, + } + + apiService.get = jest.fn().mockRejectedValueOnce(responsePayload) + + // Act + await store.dispatch(fetchWBHistoryAction(commandId)) // Assert const expectedActions = [ - sendWBCommand(), + loadWBHistory(), addErrorNotification(responsePayload as AxiosError), - sendWBCommandFailure(responsePayload.response.data.message), + loadWBHistoryFailure(responsePayload.response.data.message), ] expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions)) }) diff --git a/redisinsight/ui/src/slices/tests/workbench/wb-settings.spec.ts b/redisinsight/ui/src/slices/tests/workbench/wb-settings.spec.ts deleted file mode 100644 index 2aa0e9ae35..0000000000 --- a/redisinsight/ui/src/slices/tests/workbench/wb-settings.spec.ts +++ /dev/null @@ -1,207 +0,0 @@ -import { cloneDeep } from 'lodash' -import { apiService } from 'uiSrc/services' -import { cleanup, mockedStore, initialStateDefault } from 'uiSrc/utils/test-utils' -import reducer, { - createWBClientAction, - initialState, - processWBClient, - processWBClientFailure, - processWBClientSuccess, - workbenchSettingsSelector, - updateWBClientAction, -} from '../../workbench/wb-settings' - -let store: typeof mockedStore -beforeEach(() => { - cleanup() - store = cloneDeep(mockedStore) - store.clearActions() -}) - -jest.mock('uiSrc/services', () => ({ - ...jest.requireActual('uiSrc/services'), - localStorageService: { - set: jest.fn(), - get: jest.fn(), - }, -})) - -describe('workbenchSettings slice', () => { - describe('processWBClient', () => { - it('should properly set loading = true', () => { - // Arrange - const state = { - ...initialState, - loading: true, - } - - // Act - const nextState = reducer(initialState, processWBClient()) - - // Assert - const rootState = Object.assign(initialStateDefault, { - workbench: { - settings: nextState, - }, - }) - expect(workbenchSettingsSelector(rootState)).toEqual(state) - }) - }) - - describe('processWBClientSuccess', () => { - it('should properly set the state with fetched data', () => { - // Arrange - - const data = { uuid: '70b95d32-c19d-4311-bb24-e684af12cf15' } - const state = { - ...initialState, - loading: false, - wbClientUuid: data.uuid, - } - - // Act - const nextState = reducer(initialState, processWBClientSuccess(data?.uuid)) - - // Assert - const rootState = Object.assign(initialStateDefault, { - workbench: { - settings: nextState, - }, - }) - expect(workbenchSettingsSelector(rootState)).toEqual(state) - }) - - it('should properly set the state with empty data', () => { - // Arrange - const data = { uuid: '' } - - const state = { - ...initialState, - loading: false, - wbClientUuid: data.uuid, - } - - // Act - const nextState = reducer(initialState, processWBClientSuccess(data?.uuid)) - - // Assert - const rootState = Object.assign(initialStateDefault, { - workbench: { - settings: nextState, - }, - }) - expect(workbenchSettingsSelector(rootState)).toEqual(state) - }) - }) - - describe('processWBClientFailure', () => { - it('should properly set the error', () => { - // Arrange - const data = 'some error' - const state = { - ...initialState, - loading: false, - errorClient: data, - } - - // Act - const nextState = reducer(initialState, processWBClientFailure(data)) - - // Assert - const rootState = Object.assign(initialStateDefault, { - workbench: { - settings: nextState, - }, - }) - expect(workbenchSettingsSelector(rootState)).toEqual(state) - }) - }) - - describe('thunks', () => { - it('call both createWBClientAction and processWBClientSuccess when fetch is successed', async () => { - // Arrange - const data = { uuid: '70b95d32-c19d-4311-bb24-e684af12cf15' } - const responsePayload = { data, status: 200 } - - apiService.post = jest.fn().mockResolvedValue(responsePayload) - - // Act - await store.dispatch(createWBClientAction()) - - // Assert - const expectedActions = [ - processWBClient(), - processWBClientSuccess(responsePayload.data?.uuid), - ] - expect(store.getActions()).toEqual(expectedActions) - }) - - it('call both createWBClientAction and processWBClientFailure when fetch is fail', async () => { - // Arrange - const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' - const responsePayload = { - response: { - status: 500, - data: { message: errorMessage }, - }, - } - - apiService.post = jest.fn().mockRejectedValueOnce(responsePayload) - - // Act - await store.dispatch(createWBClientAction()) - - // Assert - const expectedActions = [ - processWBClient(), - processWBClientFailure(responsePayload.response.data.message), - ] - expect(store.getActions()).toEqual(expectedActions) - }) - - it('call both updateWBClientAction and processWBClientSuccess when fetch is successed', async () => { - // Arrange - const instanceId = '123' - const uuid = '70b95d32-c19d-4311-bb24-e684af12cf15' - const data = { uuid } - const responsePayload = { data, status: 200 } - - apiService.patch = jest.fn().mockResolvedValue(responsePayload) - - // Act - await store.dispatch(updateWBClientAction(instanceId, uuid)) - - // Assert - const expectedActions = [ - processWBClient(), - processWBClientSuccess(responsePayload.data?.uuid), - ] - expect(store.getActions()).toEqual(expectedActions) - }) - - it('call both updateWBClientAction and processWBClientFailure when fetch is fail', async () => { - // Arrange - const instanceId = '123' - const uuid = '70b95d32-c19d-4311-bb24-e684af12cf15' - const errorMessage = 'Could not connect to aoeu:123, please check the connection details.' - const responsePayload = { - response: { - status: 500, - data: { message: errorMessage }, - }, - } - - apiService.patch = jest.fn().mockRejectedValueOnce(responsePayload) - - // Act - await store.dispatch(updateWBClientAction(instanceId, uuid)) - - // Assert - const expectedActions = [ - processWBClient(), - processWBClientFailure(responsePayload.response.data.message), - ] - expect(store.getActions()).toEqual(expectedActions) - }) - }) -}) diff --git a/redisinsight/ui/src/slices/workbench/wb-results.ts b/redisinsight/ui/src/slices/workbench/wb-results.ts index 8ae4497e23..f928a5afb6 100644 --- a/redisinsight/ui/src/slices/workbench/wb-results.ts +++ b/redisinsight/ui/src/slices/workbench/wb-results.ts @@ -1,30 +1,28 @@ import { createSlice } from '@reduxjs/toolkit' -import { first } from 'lodash' -import { WBQueryType } from 'uiSrc/pages/workbench/constants' -import { apiService, localStorageService } from 'uiSrc/services' -import { ApiEndpoints, BrowserStorageItem } from 'uiSrc/constants' -import { WBHistoryObject } from 'uiSrc/pages/workbench/interfaces' +import { AxiosError } from 'axios' +import { apiService } from 'uiSrc/services' +import { ApiEndpoints } from 'uiSrc/constants' import { addErrorNotification } from 'uiSrc/slices/app/notifications' import { CliOutputFormatterType } from 'uiSrc/constants/cliOutput' import { getApiErrorMessage, getUrl, isStatusSuccessful, - multilineCommandToOneLine, } from 'uiSrc/utils' +import { WORKBENCH_HISTORY_MAX_LENGTH } from 'uiSrc/pages/workbench/constants' -import { - SendClusterCommandDto, - SendClusterCommandResponse, - SendCommandResponse, -} from 'apiSrc/modules/cli/dto/cli.dto' import { AppDispatch, RootState } from '../store' -import { StateWorkbenchResults } from '../interfaces' +import { + CommandExecution, + CommandExecutionUI, + CreateCommandExecutionDto, + StateWorkbenchResults, +} from '../interfaces' export const initialState: StateWorkbenchResults = { loading: false, error: '', - commandHistory: localStorageService?.get(BrowserStorageItem.wbInputHistory) ?? [], + items: [], } // A slice for recipes @@ -34,35 +32,108 @@ const workbenchResultsSlice = createSlice({ reducers: { setWBResultsInitialState: () => initialState, - // Send Workbench command to API - sendWBCommand: (state) => { + // Fetch Workbench history + loadWBHistory: (state) => { state.loading = true - state.error = '' }, - sendWBCommandSuccess: (state) => { - state.loading = false - state.error = '' - }, - sendWBCommandFailure: (state, { payload }) => { + loadWBHistorySuccess: (state, { payload }:{ payload: CommandExecution[] }) => { + state.items = payload state.loading = false + }, + + loadWBHistoryFailure: (state, { payload }) => { state.error = payload + state.loading = false + }, + + // Process Workbench command to API + processWBCommand: (state, { payload = '' }: { payload: string }) => { + if (!payload) return + + state.items = [...state.items].map((item) => { + if (item.id === payload) { + return { ...item, loading: true } + } + return item + }) }, - // Update Workbench command History - updateWBCommandHistory: (state, { payload }: { payload: string[] }) => { - state.commandHistory = payload + processWBCommandFailure: (state, { payload }: { payload: CommandExecutionUI }) => { + state.items = [...state.items].map((item) => { + if (item.id === payload.id) { + return { ...item, loading: false, error: payload?.error } + } + return item + }) + }, + + sendWBCommand: (state, { payload }: { payload: { command: string, commandId: string } }) => { + const newItems = [ + { id: payload.commandId, command: payload.command, loading: true, isOpen: true, error: '' }, + ...state.items + ] + + if (newItems?.length > WORKBENCH_HISTORY_MAX_LENGTH) { + newItems.pop() + } + + state.items = newItems + }, + + sendWBCommandSuccess: (state, + { payload }: { payload: { data: CommandExecution, commandId: string } }) => { + state.items = [...state.items].map((item) => { + if (item.id === payload.commandId) { + return { ...payload.data, loading: false, isOpen: true, error: '' } + } + return item + }) + }, + + fetchWBCommandSuccess: (state, { payload }: { payload: CommandExecution }) => { + state.items = [...state.items].map((item) => { + if (item.id === payload.id) { + return { ...item, ...payload, loading: false, isOpen: true, error: '' } + } + return item + }) }, + + deleteWBCommandSuccess: (state, { payload }: { payload: string }) => { + state.items = [...state.items.filter((item) => item.id !== payload)] + }, + + // toggle open card + toggleOpenWBResult: (state, { payload }: { payload: string }) => { + state.items = [...state.items].map((item) => { + if (item.id === payload) { + return { ...item, isOpen: !item.isOpen } + } + return item + }) + }, + + resetWBHistoryItems: (state) => { + state.items = [] + } }, }) // Actions generated from the slice export const { setWBResultsInitialState, + loadWBHistory, + loadWBHistorySuccess, + loadWBHistoryFailure, + processWBCommand, + fetchWBCommandSuccess, + processWBCommandFailure, sendWBCommand, sendWBCommandSuccess, - sendWBCommandFailure, - updateWBCommandHistory, + toggleOpenWBResult, + deleteWBCommandSuccess, + resetWBHistoryItems, } = workbenchResultsSlice.actions // A selector @@ -71,53 +142,72 @@ export const workbenchResultsSelector = (state: RootState) => state.workbench.re // The reducer export default workbenchResultsSlice.reducer +// Asynchronous thunk actions +export function fetchWBHistoryAction(instanceId: string) { + return async (dispatch: AppDispatch) => { + dispatch(loadWBHistory()) + + try { + const { data, status } = await apiService.get( + getUrl( + instanceId, + ApiEndpoints.WORKBENCH_COMMAND_EXECUTIONS, + ) + ) + + if (isStatusSuccessful(status)) { + dispatch(loadWBHistorySuccess(data)) + } + } catch (_err) { + const error = _err as AxiosError + const errorMessage = getApiErrorMessage(error) + dispatch(addErrorNotification(error)) + dispatch(loadWBHistoryFailure(errorMessage)) + } + } +} + // Asynchronous thunk action export function sendWBCommandAction({ command = '', - historyId, + multiCommands = '', + commandId = `${Date.now()}`, onSuccessAction, onFailAction, }: { - command: string; - historyId: number; - onSuccessAction?: (historyResponse: WBHistoryObject) => void; - onFailAction?: () => void; + command: string + multiCommands?: string + commandId?: string + onSuccessAction?: (multiCommands: string) => void + onFailAction?: () => void }) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { try { const state = stateInit() const { id = '' } = state.connections.instances.connectedInstance - dispatch(sendWBCommand()) + dispatch(sendWBCommand({ command, commandId })) - const { data, status } = await apiService.post( + const { data, status } = await apiService.post( getUrl( id, - ApiEndpoints.CLI, - state.workbench.settings?.wbClientUuid, - ApiEndpoints.SEND_COMMAND + ApiEndpoints.WORKBENCH_COMMAND_EXECUTIONS, ), { - command: multilineCommandToOneLine(command), - outputFormat: CliOutputFormatterType.Raw, + command, } ) if (isStatusSuccessful(status)) { - dispatch(sendWBCommandSuccess()) - - onSuccessAction?.({ - id: historyId, - query: command, - status: data.status, - time: Date.now(), - data: data.response - }) + dispatch(sendWBCommandSuccess({ commandId, data })) + + onSuccessAction?.(multiCommands) } - } catch (error) { + } catch (_err) { + const error = _err as AxiosError const errorMessage = getApiErrorMessage(error) dispatch(addErrorNotification(error)) - dispatch(sendWBCommandFailure(errorMessage)) + dispatch(processWBCommandFailure({ id: commandId, error: errorMessage })) onFailAction?.() } } @@ -126,53 +216,120 @@ export function sendWBCommandAction({ // Asynchronous thunk action export function sendWBCommandClusterAction({ command = '', - historyId, + multiCommands = '', options, + commandId = `${Date.now()}`, onSuccessAction, onFailAction, }: { - command: string; - historyId: number; - options: SendClusterCommandDto; - onSuccessAction?: (historyResponse: WBHistoryObject) => void; - onFailAction?: () => void; + command: string + options: CreateCommandExecutionDto + commandId?: string + multiCommands?: string + onSuccessAction?: (multiCommands: string) => void + onFailAction?: () => void }) { return async (dispatch: AppDispatch, stateInit: () => RootState) => { try { const state = stateInit() const { id = '' } = state.connections.instances.connectedInstance - dispatch(sendWBCommand()) + dispatch(sendWBCommand({ command, commandId })) - const { data, status } = await apiService.post( + const { data, status } = await apiService.post( getUrl( id, - ApiEndpoints.CLI, - state.workbench.settings?.wbClientUuid, - ApiEndpoints.SEND_CLUSTER_COMMAND + ApiEndpoints.WORKBENCH_COMMAND_EXECUTIONS, ), { ...options, - command: multilineCommandToOneLine(command), + command, outputFormat: CliOutputFormatterType.Raw, } ) if (isStatusSuccessful(status)) { - dispatch(sendWBCommandSuccess()) - - onSuccessAction?.({ - id: historyId, - query: command, - status: first(data)?.status, - time: Date.now(), - data: first(data)?.response, - }) + dispatch(sendWBCommandSuccess({ commandId, data })) + + onSuccessAction?.(multiCommands) + } + } catch (_err) { + const error = _err as AxiosError + const errorMessage = getApiErrorMessage(error) + dispatch(addErrorNotification(error)) + dispatch(processWBCommandFailure({ id: commandId, error: errorMessage })) + onFailAction?.() + } + } +} + +// Asynchronous thunk action +export function fetchWBCommandAction( + commandId: string, + onSuccessAction?: () => void, + onFailAction?: () => void, +) { + return async (dispatch: AppDispatch, stateInit: () => RootState) => { + try { + const state = stateInit() + const { id = '' } = state.connections.instances.connectedInstance + + dispatch(processWBCommand(commandId)) + + const { data, status } = await apiService.get( + getUrl( + id, + ApiEndpoints.WORKBENCH_COMMAND_EXECUTIONS, + commandId + ), + ) + + if (isStatusSuccessful(status)) { + dispatch(fetchWBCommandSuccess(data)) + + onSuccessAction?.() + } + } catch (_err) { + const error = _err as AxiosError + const errorMessage = getApiErrorMessage(error) + dispatch(addErrorNotification(error)) + dispatch(processWBCommandFailure({ id: commandId, error: errorMessage })) + onFailAction?.() + } + } +} + +// Asynchronous thunk action +export function deleteWBCommandAction( + commandId: string, + onSuccessAction?: () => void, + onFailAction?: () => void, +) { + return async (dispatch: AppDispatch, stateInit: () => RootState) => { + try { + const state = stateInit() + const { id = '' } = state.connections.instances.connectedInstance + + dispatch(processWBCommand(commandId)) + + const { status } = await apiService.delete( + getUrl( + id, + ApiEndpoints.WORKBENCH_COMMAND_EXECUTIONS, + commandId, + ), + ) + + if (isStatusSuccessful(status)) { + dispatch(deleteWBCommandSuccess(commandId)) + + onSuccessAction?.() } - } catch (error) { + } catch (_err) { + const error = _err as AxiosError const errorMessage = getApiErrorMessage(error) dispatch(addErrorNotification(error)) - dispatch(sendWBCommandFailure(errorMessage)) + dispatch(processWBCommandFailure({ id: commandId, error: errorMessage })) onFailAction?.() } } diff --git a/redisinsight/ui/src/slices/workbench/wb-settings.ts b/redisinsight/ui/src/slices/workbench/wb-settings.ts deleted file mode 100644 index 3d5cab4d8a..0000000000 --- a/redisinsight/ui/src/slices/workbench/wb-settings.ts +++ /dev/null @@ -1,114 +0,0 @@ -import { createSlice } from '@reduxjs/toolkit' -import { apiService, localStorageService } from 'uiSrc/services' -import { ApiEndpoints, BrowserStorageItem } from 'uiSrc/constants' -import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils' - -import { CreateCliClientResponse } from 'apiSrc/modules/cli/dto/cli.dto' -import { AppDispatch, RootState } from '../store' -import { StateWorkbenchSettings } from '../interfaces' -// import { addErrorNotification } from '../app/notifications'; - -export const initialState: StateWorkbenchSettings = { - loading: false, - error: '', - errorClient: '', - wbClientUuid: localStorageService.get(BrowserStorageItem.wbClientUuid) ?? '', - unsupportedCommands: [], -} - -// A slice for recipes -const workbenchSettingsSlice = createSlice({ - name: 'workbenchSettings', - initialState, - reducers: { - setWBSettingsInitialState: () => initialState, - - // create, update, delete Workbench Client - processWBClient: (state) => { - state.loading = true - }, - processWBClientSuccess: (state, { payload }: { payload: string }) => { - state.loading = false - state.wbClientUuid = payload - - state.errorClient = '' - }, - processWBClientFailure: (state, { payload }) => { - state.loading = false - state.errorClient = payload - }, - }, -}) - -// Actions generated from the slice -export const { - setWBSettingsInitialState, - processWBClient, - processWBClientSuccess, - processWBClientFailure, -} = workbenchSettingsSlice.actions - -// A selector -export const workbenchSettingsSelector = (state: RootState) => state.workbench.settings - -// The reducer -export default workbenchSettingsSlice.reducer - -// Asynchronous thunk action -export function createWBClientAction( - instanceId: string = '', - onSuccessAction?: () => void, - onFailAction?: (message: string) => void -) { - return async (dispatch: AppDispatch) => { - dispatch(processWBClient()) - - try { - const { data, status } = await apiService.post( - getUrl(instanceId, ApiEndpoints.CLI), - { namespace: 'workbench' }, - ) - - if (isStatusSuccessful(status)) { - localStorage.setItem(BrowserStorageItem.wbClientUuid, data?.uuid) - dispatch(processWBClientSuccess(data?.uuid)) - - onSuccessAction?.() - } - } catch (error) { - const errorMessage = getApiErrorMessage(error) - dispatch(processWBClientFailure(errorMessage)) - onFailAction?.(errorMessage) - } - } -} - -// Asynchronous thunk action -export function updateWBClientAction( - instanceId: string = '', - uuid: string, - onSuccessAction?: () => void, - onFailAction?: (message: string) => void, -) { - return async (dispatch: AppDispatch) => { - dispatch(processWBClient()) - - try { - const { data, status } = await apiService.patch( - getUrl(instanceId, ApiEndpoints.CLI, uuid), - { namespace: 'workbench' }, - ) - - if (isStatusSuccessful(status)) { - localStorage.setItem(BrowserStorageItem.wbClientUuid, data?.uuid) - dispatch(processWBClientSuccess(data?.uuid)) - - onSuccessAction?.() - } - } catch (error) { - const errorMessage = getApiErrorMessage(error) - dispatch(processWBClientFailure(errorMessage)) - onFailAction?.(errorMessage) - } - } -} diff --git a/redisinsight/ui/src/styles/base/_helpers.scss b/redisinsight/ui/src/styles/base/_helpers.scss index e52dbed415..a4bec64135 100644 --- a/redisinsight/ui/src/styles/base/_helpers.scss +++ b/redisinsight/ui/src/styles/base/_helpers.scss @@ -43,6 +43,14 @@ } } +.transparent { + opacity: 0; +} + +.inline-flex { + display: inline-flex !important; +} + .copy-btn, .copy-near-btn { display: flex; diff --git a/redisinsight/ui/src/utils/apiResponse.ts b/redisinsight/ui/src/utils/apiResponse.ts index 7af0ea0228..48d1bbdc7f 100644 --- a/redisinsight/ui/src/utils/apiResponse.ts +++ b/redisinsight/ui/src/utils/apiResponse.ts @@ -4,7 +4,7 @@ import { AddRedisDatabaseStatus, IBulkOperationResult } from 'uiSrc/slices/inter export function getApiErrorMessage(error: AxiosError): string { const errorMessage = error?.response?.data?.message - if (!error) { + if (!error || !error.response) { return 'Something was wrong!' } if (isArray(errorMessage)) { diff --git a/redisinsight/ui/src/utils/cliHelper.tsx b/redisinsight/ui/src/utils/cliHelper.tsx index 38daa69140..0f05b68167 100644 --- a/redisinsight/ui/src/utils/cliHelper.tsx +++ b/redisinsight/ui/src/utils/cliHelper.tsx @@ -6,6 +6,7 @@ import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli' import { resetOutput, updateCliCommandHistory } from 'uiSrc/slices/cli/cli-output' import { BrowserStorageItem } from 'uiSrc/constants' import { ModuleCommandPrefix } from 'uiSrc/pages/workbench/constants' +import { SelectCommand } from 'uiSrc/constants/cliOutput' import { ClusterNode, RedisDefaultModules } from 'uiSrc/slices/interfaces' import { RedisModuleDto } from 'apiSrc/modules/instances/dto/database-instance.dto' @@ -28,14 +29,14 @@ const cliParseTextResponseWithRedirect = ( const { host, port, slot } = redirectTo redirectMessage = `-> Redirected to slot [${slot}] located at ${host}:${port}` } - return [redirectMessage, '\n', cliParseTextResponse(text, command, status), '\n\n'] + return [redirectMessage, '\n', cliParseTextResponse(text, command, status), '\n'] } const cliParseTextResponseWithOffset = ( text: string = '', command: string = '', status: CommandExecutionStatus = CommandExecutionStatus.Success, -) => [cliParseTextResponse(text, command, status), '\n\n'] +) => [cliParseTextResponse(text, command, status), '\n'] const cliParseTextResponse = ( text: string = '', @@ -60,9 +61,9 @@ const cliParseTextResponse = ( ) -const cliCommandOutput = (command: string) => [bashTextValue(), cliCommandWrapper(command), '\n'] +const cliCommandOutput = (command: string, dbIndex = 0) => ['\n', bashTextValue(dbIndex), cliCommandWrapper(command), '\n'] -const bashTextValue = () => '> ' +const bashTextValue = (dbIndex = 0) => (dbIndex > 0 ? `[${dbIndex}] > ` : '> ') const cliCommandWrapper = (command: string) => ( @@ -99,7 +100,7 @@ const updateCliHistoryStorage = ( const checkUnsupportedCommand = (unsupportedCommands: string[], commandLine: string) => unsupportedCommands?.find((command) => - commandLine?.trim().toLowerCase().startsWith(command)) + commandLine?.trim().toLowerCase().startsWith(command?.toLowerCase())) const checkBlockingCommand = (blockingCommands: string[], commandLine: string) => blockingCommands?.find((command) => commandLine?.trim().toLowerCase().startsWith(command)) @@ -121,6 +122,18 @@ const checkUnsupportedModuleCommand = (loadedModules: RedisModuleDto[], commandL return commandModule } +const getDbIndexFromSelectQuery = (query: string): number => { + const [command, ...args] = query.trim().split(' ') + if (command.toLowerCase() !== SelectCommand.toLowerCase()) { + throw new Error('Invalid command') + } + try { + return parseInt(args[0].replace(/['"]/g, '').trim()) + } catch (e) { + throw Error('Parsing error') + } +} + export { cliParseTextResponse, cliParseTextResponseWithOffset, @@ -133,4 +146,5 @@ export { checkUnsupportedCommand, checkBlockingCommand, checkUnsupportedModuleCommand, + getDbIndexFromSelectQuery, } diff --git a/redisinsight/ui/src/utils/commands.ts b/redisinsight/ui/src/utils/commands.ts index 6c942a0a66..23614b5c43 100644 --- a/redisinsight/ui/src/utils/commands.ts +++ b/redisinsight/ui/src/utils/commands.ts @@ -1,4 +1,4 @@ -import { flatten, isArray, isEmpty, reject } from 'lodash' +import { flatten, isArray, isEmpty, isNumber, reject, toNumber, isNaN, isInteger } from 'lodash' import { CommandArgsType, CommandGroup, @@ -65,7 +65,6 @@ const getExternalCommandFormat = (commandName = '') => export const getDocUrlForCommand = ( commandName: string, - commandGroup: CommandGroup | string = CommandGroup.Generic ): string => { let command = getExternalCommandFormat(commandName) const commandStartsWith = commandName.split('.')[0] @@ -81,8 +80,32 @@ export const getDocUrlForCommand = ( return `https://oss.redis.com/redisgraph/commands/#${command}` case CommandPrefix.AI: return `https://oss.redis.com/redisai/commands/#${command}` + case CommandPrefix.Gears: + return `https://oss.redis.com/redisgears/commands.html#${command}` + case CommandPrefix.BloomFilter: + return `https://oss.redis.com/redisbloom/Bloom_Commands/#${command}` + case CommandPrefix.CuckooFilter: + return `https://oss.redis.com/redisbloom/Cuckoo_Commands/#${command}` + case CommandPrefix.CountMinSketchFilter: + return `https://oss.redis.com/redisbloom/CountMinSketch_Commands/#${command}` + case CommandPrefix.TopK: + return `https://oss.redis.com/redisbloom/TopK_Commands/#${command}` default: command = commandName.replace(/\s+/g, '-').toLowerCase() return `https://redis.io/commands/${command}` } } + +export const getCommandRepeat = (command = ''): [string, number] => { + const [countRepeatStr, ...restCommand] = command.split(' ') + let countRepeat = toNumber(countRepeatStr) + let commandLine = restCommand.join(' ') + if (!isNumber(countRepeat) || isNaN(countRepeat) || !command) { + countRepeat = 1 + commandLine = command + } + + return [commandLine, countRepeat] +} + +export const isRepeatCountCorrect = (number: number): boolean => number >= 1 && isInteger(number) diff --git a/redisinsight/ui/src/utils/common.ts b/redisinsight/ui/src/utils/common.ts index 84f626a322..4fe0fc81fa 100644 --- a/redisinsight/ui/src/utils/common.ts +++ b/redisinsight/ui/src/utils/common.ts @@ -1,9 +1,8 @@ const baseApiUrl = process.env.BASE_API_URL -const resourcesBaseUrl = process.env.RESOURCES_BASE_URL const isDevelopment = process.env.NODE_ENV === 'development' const isWebApp = process.env.APP_ENV === 'web' const apiPort = process.env.API_PORT export const getBaseApiUrl = () => (!isDevelopment && isWebApp - ? `${resourcesBaseUrl}:${apiPort}` + ? window.location.origin : `${baseApiUrl}:${apiPort}`) diff --git a/redisinsight/ui/src/utils/index.ts b/redisinsight/ui/src/utils/index.ts index 9f7ccac1e2..a39f554bde 100644 --- a/redisinsight/ui/src/utils/index.ts +++ b/redisinsight/ui/src/utils/index.ts @@ -6,6 +6,7 @@ import RouterWithSubRoutes from './routerWithSubRoutes' import replaceSpaces from './replaceSpaces' import setFavicon from './setFavicon' import setTitle from './setPageTitle' +import formatToText from './cliTextFormatter' export * from './common' export * from './validations' @@ -13,25 +14,25 @@ export * from './errors' export * from './statuses' export * from './instanceOptions' export * from './truncateTTL' -export * from './trancateNumber' +export * from './truncateNumber' export * from './apiResponse' export * from './parseResponse' export * from './compareVersions' export * from './compareConsents' export * from './longNames' export * from './cliHelper' -export * from './cliTextFormatter' export * from './commands' export * from './workbench' export * from './formatBytes' export * from './instanceModules' export * from './monacoUtils' export * from './monacoInterfaces' -export * from './monacoRedisComplitionProvider' +export * from './monacoRedisCompletionProvider' export * from './monacoRedisMonarchTokensProvider' export * from './monacoRedisSignatureHelpProvider' export * from './monacoActions' export * from './monacoDecorations' +export * from './monitorUtils' export * from './handlePlatforms' export * from './plugins' @@ -45,4 +46,5 @@ export { RouterWithSubRoutes, setFavicon, setTitle, + formatToText, } diff --git a/redisinsight/ui/src/utils/monacoRedisComplitionProvider.ts b/redisinsight/ui/src/utils/monacoRedisCompletionProvider.ts similarity index 89% rename from redisinsight/ui/src/utils/monacoRedisComplitionProvider.ts rename to redisinsight/ui/src/utils/monacoRedisCompletionProvider.ts index 4bd7a830c4..55558880cd 100644 --- a/redisinsight/ui/src/utils/monacoRedisComplitionProvider.ts +++ b/redisinsight/ui/src/utils/monacoRedisCompletionProvider.ts @@ -1,3 +1,4 @@ +import { isNaN } from 'lodash' import * as monacoEditor from 'monaco-editor' import { ICommand, ICommandArgGenerated, ICommands } from 'uiSrc/constants' import { generateArgs, generateArgsNames, getDocUrlForCommand } from 'uiSrc/utils/commands' @@ -7,7 +8,7 @@ type DependencyProposals = { } const getCommandMarkdown = (commandName = '', command: ICommand): string => { - const docUrl = getDocUrlForCommand(commandName, command?.group) + const docUrl = getDocUrlForCommand(commandName) const linkMore = ` [Read more](${docUrl})` const lines: string[] = [command?.summary + linkMore] if (command?.arguments?.length) { @@ -65,12 +66,19 @@ monacoEditor.languages.CompletionItemProvider => { position: monacoEditor.Position ): monacoEditor.languages.CompletionList => { const word = model.getWordUntilPosition(position) + const line = model.getLineContent(position.lineNumber) + const indexOfSpace = line.indexOf(' ') + const range = { startLineNumber: position.lineNumber, endLineNumber: position.lineNumber, - startColumn: 1, - endColumn: word.endColumn + endColumn: word.endColumn, + startColumn: + word.startColumn > indexOfSpace && !isNaN(+line.slice(0, indexOfSpace)) + ? indexOfSpace + 2 + : 1, } + // display suggestions only for words that don't belong to a folding area if (!model.getValueInRange(range).startsWith(' ')) { return { diff --git a/redisinsight/ui/src/utils/monacoUtils.ts b/redisinsight/ui/src/utils/monacoUtils.ts index c0a830eb86..1b6560205b 100644 --- a/redisinsight/ui/src/utils/monacoUtils.ts +++ b/redisinsight/ui/src/utils/monacoUtils.ts @@ -3,6 +3,7 @@ import { isEmpty, isUndefined, reject } from 'lodash' import { ICommands } from 'uiSrc/constants' import { IMonacoCommand } from './monacoInterfaces' import { Nullable } from './types' +import { getCommandRepeat, isRepeatCountCorrect } from './commands' const COMMENT_SYMBOLS = '//' const BLANK_LINE_REGEX = /^\s*\n/gm @@ -21,7 +22,20 @@ const removeCommentsFromLine = (text: string = '', prefix: string = ''): string return prefix + text.replace(/\/\/.*/, '') } -export const splitMonacoValuePerLines = (command = '') => command.split(/\n(?=[^\s])/g) +export const splitMonacoValuePerLines = (command = '') => { + const linesResult: string[] = [] + const lines = command.split(/\n(?=[^\s])/g) + lines.forEach((line) => { + const [commandLine, countRepeat] = getCommandRepeat(line) + + if (!isRepeatCountCorrect(countRepeat)) { + linesResult.push(line) + return + } + linesResult.push(...Array(countRepeat).fill(commandLine)) + }) + return linesResult +} export const getMultiCommands = (commands:string[] = []) => reject(commands, isEmpty).join('\n') ?? '' diff --git a/redisinsight/ui/src/utils/monitorUtils.ts b/redisinsight/ui/src/utils/monitorUtils.ts new file mode 100644 index 0000000000..ba7f16e4bc --- /dev/null +++ b/redisinsight/ui/src/utils/monitorUtils.ts @@ -0,0 +1,4 @@ +import { format } from 'date-fns' + +export const getFormatTime = (time: string = '') => + format(new Date(+time * 1_000), 'HH:mm:ss.SSS') diff --git a/redisinsight/ui/src/utils/test-utils.tsx b/redisinsight/ui/src/utils/test-utils.tsx index ec73768284..162bec02f2 100644 --- a/redisinsight/ui/src/utils/test-utils.tsx +++ b/redisinsight/ui/src/utils/test-utils.tsx @@ -28,9 +28,9 @@ import { initialState as initialStateAppRedisCommands } from 'uiSrc/slices/app/r import { initialState as initialStateAppPluginsReducer } from 'uiSrc/slices/app/plugins' import { initialState as initialStateCliSettings } from 'uiSrc/slices/cli/cli-settings' import { initialState as initialStateCliOutput } from 'uiSrc/slices/cli/cli-output' +import { initialState as initialStateMonitor } from 'uiSrc/slices/cli/monitor' import { initialState as initialStateUserSettings } from 'uiSrc/slices/user/user-settings' import { initialState as initialStateWBResults } from 'uiSrc/slices/workbench/wb-results' -import { initialState as initialStateWBSettings } from 'uiSrc/slices/workbench/wb-settings' import { initialState as initialStateWBEnablementArea } from 'uiSrc/slices/workbench/wb-enablement-area' interface Options { @@ -69,13 +69,13 @@ const initialStateDefault: RootState = { cli: { settings: cloneDeep(initialStateCliSettings), output: cloneDeep(initialStateCliOutput), + monitor: cloneDeep(initialStateMonitor), }, user: { settings: cloneDeep(initialStateUserSettings), }, workbench: { results: cloneDeep(initialStateWBResults), - settings: cloneDeep(initialStateWBSettings), enablementArea: cloneDeep(initialStateWBEnablementArea), }, } diff --git a/redisinsight/ui/src/utils/tests/cliHelper.spec.ts b/redisinsight/ui/src/utils/tests/cliHelper.spec.ts new file mode 100644 index 0000000000..d6aae59962 --- /dev/null +++ b/redisinsight/ui/src/utils/tests/cliHelper.spec.ts @@ -0,0 +1,29 @@ +import { getDbIndexFromSelectQuery } from 'uiSrc/utils' + +const getDbIndexFromSelectQueryTests = [ + { input: 'select 0', expected: 0 }, + { input: 'select 1', expected: 1 }, + { input: 'SELECT 10', expected: 10 }, + { input: 'SeLeCt 10', expected: 10 }, + { input: 'select "1"', expected: 1 }, + { input: ' select "1" ', expected: 1 }, + { input: 'select \'1\'', expected: 1 }, + { input: 'select \'1\'', expected: 1 }, + { input: 'info', expected: new Error('Invalid command') }, + { input: 'select "1 1231"', expected: new Error('Parsing error') }, + { input: 'select abc', expected: new Error('Parsing error') }, +] + +describe('getDbIndexFromSelectQuery', () => { + test.each(getDbIndexFromSelectQueryTests)('%j', ({ input, expected }) => { + if (expected instanceof Error) { + try { + getDbIndexFromSelectQuery(input) + } catch (e) { + expect(e.message).toEqual(expected.message) + } + } else { + expect(getDbIndexFromSelectQuery(input)).toEqual(expected) + } + }) +}) diff --git a/redisinsight/ui/src/utils/tests/commands.spec.ts b/redisinsight/ui/src/utils/tests/commands.spec.ts index adfa774301..46401ecc8b 100644 --- a/redisinsight/ui/src/utils/tests/commands.spec.ts +++ b/redisinsight/ui/src/utils/tests/commands.spec.ts @@ -1,4 +1,4 @@ -import { CommandGroup, ICommandArgGenerated, ICommands, MOCK_COMMANDS_SPEC } from 'uiSrc/constants' +import { ICommandArgGenerated, ICommands, MOCK_COMMANDS_SPEC } from 'uiSrc/constants' import { generateArgs, generateArgsNames, getComplexityShortNotation, getDocUrlForCommand } from '../commands' import { cleanup } from '../test-utils' @@ -195,24 +195,29 @@ describe('generateArgName', () => { }) const getDocUrlForCommandTests: any[] = [ - ['SET', CommandGroup.String, 'https://redis.io/commands/set'], - ['ACL SETUSER', CommandGroup.Server, 'https://redis.io/commands/acl-setuser'], - ['JSON.GET', CommandGroup.JSON, 'https://oss.redis.com/redisjson/commands/#jsonget'], - ['FT.CREATE', CommandGroup.Search, 'https://oss.redis.com/redisearch/Commands/#ftcreate'], - ['FT.ALTER SCHEMA ADD', CommandGroup.Search, 'https://oss.redis.com/redisearch/Commands/#ftalter_schema_add'], - ['TS.ADD', CommandGroup.TimeSeries, 'https://oss.redis.com/redistimeseries/commands/#tsadd'], - ['TS.CREATE', CommandGroup.TimeSeries, 'https://oss.redis.com/redistimeseries/commands/#tscreate'], - ['GRAPH.EXPLAIN', CommandGroup.Graph, 'https://oss.redis.com/redisgraph/commands/#graphexplain'], - ['GRAPH.QUERY', CommandGroup.Graph, 'https://oss.redis.com/redisgraph/commands/#graphquery'], - ['AI.MODELRUN', CommandGroup.AI, 'https://oss.redis.com/redisai/commands/#aimodelrun'], - ['AI.SCRIPTDEL', CommandGroup.AI, 'https://oss.redis.com/redisai/commands/#aiscriptdel'], - ['NON EXIST COMMAND', 'non-exist', 'https://redis.io/commands/non-exist-command'], + ['SET', 'https://redis.io/commands/set'], + ['ACL SETUSER', 'https://redis.io/commands/acl-setuser'], + ['JSON.GET', 'https://oss.redis.com/redisjson/commands/#jsonget'], + ['FT.CREATE', 'https://oss.redis.com/redisearch/Commands/#ftcreate'], + ['FT.ALTER SCHEMA ADD', 'https://oss.redis.com/redisearch/Commands/#ftalter_schema_add'], + ['TS.ADD', 'https://oss.redis.com/redistimeseries/commands/#tsadd'], + ['TS.CREATE', 'https://oss.redis.com/redistimeseries/commands/#tscreate'], + ['GRAPH.EXPLAIN', 'https://oss.redis.com/redisgraph/commands/#graphexplain'], + ['GRAPH.QUERY', 'https://oss.redis.com/redisgraph/commands/#graphquery'], + ['AI.MODELRUN', 'https://oss.redis.com/redisai/commands/#aimodelrun'], + ['BF.INFO', 'https://oss.redis.com/redisbloom/Bloom_Commands/#bfinfo'], + ['CMS.INITBYDIM', 'https://oss.redis.com/redisbloom/CountMinSketch_Commands/#cmsinitbydim'], + ['CF.INSERT', 'https://oss.redis.com/redisbloom/Cuckoo_Commands/#cfinsert'], + ['RG.CONFIGSET', 'https://oss.redis.com/redisgears/commands.html#rgconfigset'], + ['TOPK.INFO', 'https://oss.redis.com/redisbloom/TopK_Commands/#topkinfo'], + ['AI.SCRIPTDEL', 'https://oss.redis.com/redisai/commands/#aiscriptdel'], + ['NON EXIST COMMAND', 'https://redis.io/commands/non-exist-command'], ] describe('getDocUrlForCommand', () => { - it.each(getDocUrlForCommandTests)('for input: %s (command), %s (group), should be output: %s', - (command, group, expected) => { - const result = getDocUrlForCommand(command, group) + it.each(getDocUrlForCommandTests)('for input: %s (command), should be output: %s', + (command, expected) => { + const result = getDocUrlForCommand(command) expect(result).toBe(expected) }) }) diff --git a/redisinsight/ui/src/utils/tests/monacoUtils.spec.ts b/redisinsight/ui/src/utils/tests/monacoUtils.spec.ts index 9caad52b33..6f2aa26a47 100644 --- a/redisinsight/ui/src/utils/tests/monacoUtils.spec.ts +++ b/redisinsight/ui/src/utils/tests/monacoUtils.spec.ts @@ -1,4 +1,4 @@ -import { multilineCommandToOneLine, removeMonacoComments } from 'uiSrc/utils' +import { multilineCommandToOneLine, removeMonacoComments, splitMonacoValuePerLines } from 'uiSrc/utils' describe('removeMonacoComments', () => { const cases = [ @@ -68,3 +68,35 @@ describe('multilineCommandToOneLine', () => { } ) }) + +describe('splitMonacoValuePerLines', () => { + const cases = [ + // Multi commands + [ + 'get test\nget test2\nget bar', + ['get test', 'get test2', 'get bar'] + ], + // Multi commands a lot of lines + [ + 'get test\nget test2\nget bar\nget bar\nget bar\nget bar\nget bar\nget bar', + ['get test', 'get test2', 'get bar', 'get bar', 'get bar', 'get bar', 'get bar', 'get bar'] + ], + // Multi commands with repeating + [ + 'get test\n3 get test2\nget bar', + ['get test', 'get test2', 'get test2', 'get test2', 'get bar'] + ], + // Multi commands with repeating syntax error + [ + 'get test\n3get test2\nget bar', + ['get test', '3get test2', 'get bar'] + ], + ] + test.each(cases)( + 'given %p as argument, returns %p', + (arg: string, expectedResult) => { + const result = splitMonacoValuePerLines(arg) + expect(result).toEqual(expectedResult) + } + ) +}) diff --git a/redisinsight/ui/src/utils/tests/monitorUtils.spec.ts b/redisinsight/ui/src/utils/tests/monitorUtils.spec.ts new file mode 100644 index 0000000000..f4d26baecf --- /dev/null +++ b/redisinsight/ui/src/utils/tests/monitorUtils.spec.ts @@ -0,0 +1,16 @@ +import { getFormatTime } from '../monitorUtils' + +const getOutputForFormatTime: any[] = [ + ['1641450853.668074', '09:34:13.668'], + ['1641450854.612083', '09:34:14.612'], + ['1641450856.616102', '09:34:16.616'], + ['1641450858.616121', '09:34:18.616'], +] + +describe.skip('formatToText', () => { + it.each(getOutputForFormatTime)('for input: %s (reply), should be output: %s', + (reply, expected) => { + const result = getFormatTime(reply) + expect(result).toBe(expected) + }) +}) diff --git a/redisinsight/ui/src/utils/trancateNumber.ts b/redisinsight/ui/src/utils/truncateNumber.ts similarity index 100% rename from redisinsight/ui/src/utils/trancateNumber.ts rename to redisinsight/ui/src/utils/truncateNumber.ts diff --git a/redisinsight/ui/src/utils/workbench.ts b/redisinsight/ui/src/utils/workbench.ts index d1da39ca24..d2e8ee0274 100644 --- a/redisinsight/ui/src/utils/workbench.ts +++ b/redisinsight/ui/src/utils/workbench.ts @@ -1,34 +1,7 @@ -import { Dispatch, PayloadAction } from '@reduxjs/toolkit' -import { BrowserStorageItem } from 'uiSrc/constants' import { WBQueryType } from 'uiSrc/pages/workbench/constants' -import { localStorageService } from 'uiSrc/services' -import { updateWBCommandHistory } from 'uiSrc/slices/workbench/wb-results' import { IPluginVisualization } from 'uiSrc/slices/interfaces' import { getVisualizationsByCommand } from 'uiSrc/utils/plugins' -const updateWBHistoryStorage = ( - command: string = '', - dispatch: Dispatch> -) => { - if (!command) { - return - } - const maxCountCommandHistory = 30 - - const commandHistoryPrev = localStorageService.get(BrowserStorageItem.wbInputHistory) ?? [] - - const commandHistory = [command?.trim()] - .concat(commandHistoryPrev) - .slice(0, maxCountCommandHistory) - - localStorageService.set( - BrowserStorageItem.wbInputHistory, - commandHistory.slice(0, maxCountCommandHistory) - ) - - dispatch?.(updateWBCommandHistory?.(commandHistory)) -} - const getWBQueryType = (query: string = '', views: IPluginVisualization[] = []) => { const defaultPluginView = getVisualizationsByCommand(query, views) .find((view) => view.default) @@ -36,4 +9,4 @@ const getWBQueryType = (query: string = '', views: IPluginVisualization[] = []) return defaultPluginView ? WBQueryType.Plugin : WBQueryType.Text } -export { updateWBHistoryStorage, getWBQueryType } +export { getWBQueryType } diff --git a/scripts/build-statics.cmd b/scripts/build-statics.cmd index 98ce8415e3..dfab8dc575 100644 --- a/scripts/build-statics.cmd +++ b/scripts/build-statics.cmd @@ -20,6 +20,3 @@ if not exist "%PLUGINS_DIR%\redisearch" mkdir "%PLUGINS_DIR%\redisearch" if not exist "%PLUGINS_DIR%\redisearch\dist" mkdir "%PLUGINS_DIR%\redisearch\dist" xcopy "%REDISEARCH_DIR%\dist" "%PLUGINS_DIR%\redisearch\dist\" /s /e /y copy "%REDISEARCH_DIR%\package.json" "%PLUGINS_DIR%\redisearch\" - -:: =============== Enablement area =============== -xcopy ".\redisinsight\ui\src\packages\enablement-area" ".\redisinsight\api\static\workbench\" /s /e /y diff --git a/scripts/build-statics.sh b/scripts/build-statics.sh index 842abbb864..b9b2fab17b 100644 --- a/scripts/build-statics.sh +++ b/scripts/build-statics.sh @@ -18,6 +18,3 @@ yarn --cwd "${REDISEARCH_DIR}" yarn --cwd "${REDISEARCH_DIR}" build mkdir -p "${PLUGINS_DIR}/redisearch" cp -R "${REDISEARCH_DIR}/dist" "${REDISEARCH_DIR}/package.json" "${PLUGINS_DIR}/redisearch" - -# =============== Enablement area =============== -cp -R "./redisinsight/ui/src/packages/enablement-area" "./redisinsight/api/static/workbench" diff --git a/tests/e2e/.env b/tests/e2e/.env index 10ea415a89..52a6bc936a 100644 --- a/tests/e2e/.env +++ b/tests/e2e/.env @@ -1,2 +1,3 @@ COMMON_URL=https://app:5000 OSS_SENTINEL_PASSWORD=password +APP_FOLDER_NAME=.redisinsight-preview diff --git a/tests/e2e/.gitignore b/tests/e2e/.gitignore new file mode 100644 index 0000000000..5a02d10815 --- /dev/null +++ b/tests/e2e/.gitignore @@ -0,0 +1 @@ +plugins diff --git a/tests/e2e/docker-compose.yml b/tests/e2e/docker-compose.yml index c1b7eaf9e1..878bf0916b 100644 --- a/tests/e2e/docker-compose.yml +++ b/tests/e2e/docker-compose.yml @@ -8,9 +8,13 @@ services: tty: true volumes: - ./results:/usr/src/app/results + - ./plugins:/usr/src/app/plugins env_file: - ./.env entrypoint: [ + './upload-custom-plugins.sh', + ] + command: [ './wait-for-it.sh', 'redis-enterprise:12000', '-s', '-t', '120', '--', 'npx', 'yarn', 'test:chrome:ci' @@ -20,9 +24,13 @@ services: app: cap_add: - ipc_lock + env_file: + - ./.env build: context: ./../../ dockerfile: Dockerfile + volumes: + - ./plugins:/root/.redisinsight-preview/plugins ports: - 5000:5000 # oss standalone @@ -35,7 +43,7 @@ services: # oss standalone redisearch oss-standalone-redisearch: - image: redislabs/redisearch:edge + image: redislabs/redismod # oss sentinel oss-sentinel: @@ -60,3 +68,10 @@ services: build: ./rte/redis-enterprise cap_add: - sys_resource + + oss-standalone-big: + build: + context: ./rte/oss-standalone-big + dockerfile: Dockerfile + args: + TEST_DB_DUMP: $TEST_BIG_DB_DUMP diff --git a/tests/e2e/docker.docker-compose.yml b/tests/e2e/docker.docker-compose.yml index b688d28647..d206b44767 100644 --- a/tests/e2e/docker.docker-compose.yml +++ b/tests/e2e/docker.docker-compose.yml @@ -5,3 +5,7 @@ services: cap_add: - ipc_lock image: riv2:latest + env_file: + - ./.env + volumes: + - ./plugins:/root/.redisinsight-preview/plugins diff --git a/tests/e2e/e2e.Dockerfile b/tests/e2e/e2e.Dockerfile index f4e06d6c66..306c5a77f9 100644 --- a/tests/e2e/e2e.Dockerfile +++ b/tests/e2e/e2e.Dockerfile @@ -4,7 +4,7 @@ USER root WORKDIR /usr/src/app -RUN apk add --no-cache bash +RUN apk add --no-cache bash curl COPY package.json yarn.lock ./ @@ -13,5 +13,6 @@ RUN npx yarn COPY . . RUN chmod +x wait-for-it.sh +RUN chmod +x upload-custom-plugins.sh ENTRYPOINT ["npx", "yarn", "test:chrome:ci"] diff --git a/tests/e2e/helpers/common.ts b/tests/e2e/helpers/common.ts index 578ebd4ed1..a3909dbd70 100644 --- a/tests/e2e/helpers/common.ts +++ b/tests/e2e/helpers/common.ts @@ -75,4 +75,12 @@ export class Common { } return arr; } + + /** + * Get background colour of element + * @param element The selector of the element + */ + async getBackgroundColour(element: Selector): Promise { + return element.getStyleProperty('background-color'); + } } diff --git a/tests/e2e/helpers/conf.ts b/tests/e2e/helpers/conf.ts index 949cd09ee9..47e5c8d48f 100644 --- a/tests/e2e/helpers/conf.ts +++ b/tests/e2e/helpers/conf.ts @@ -1,3 +1,6 @@ +import { Chance } from 'chance'; +const chance = new Chance(); + // Urls for using in the tests export const commonUrl = process.env.COMMON_URL || 'https://localhost:5000'; @@ -52,3 +55,10 @@ export const invalidOssStandaloneConfig = { databaseUsername: process.env.OSS_STANDALONE_USERNAME, databasePassword: process.env.OSS_STANDALONE_PASSWORD }; +export const ossBigStandaloneConfig = { + host: process.env.OSS_STANDALONE_BIG_HOST || 'oss-standalone-big', + port: process.env.OSS_STANDALONE_BIG_PORT || '6379', + databaseName: process.env.OSS_STANDALONE_BIG_DATABASE_NAME || chance.string({ length: 20 }), + databaseUsername: process.env.OSS_STANDALONE_BIG_USERNAME, + databasePassword: process.env.OSS_STANDALONE_BIG_PASSWORD +}; diff --git a/tests/e2e/helpers/constants.ts b/tests/e2e/helpers/constants.ts index 9dbba31195..69b4d422f1 100644 --- a/tests/e2e/helpers/constants.ts +++ b/tests/e2e/helpers/constants.ts @@ -9,6 +9,7 @@ export enum KeyTypesTexts { Graph = 'GRAPH', TimeSeries = 'TS', } +export const keyLength = 50; export const COMMANDS_TO_CREATE_KEY = Object.freeze({ [KeyTypesTexts.Hash]: (key: string, field: string | number = 1, value: string | number = 1) => `HSET ${key} ${field} ${value}`, diff --git a/tests/e2e/helpers/keys.ts b/tests/e2e/helpers/keys.ts new file mode 100644 index 0000000000..26346cc00c --- /dev/null +++ b/tests/e2e/helpers/keys.ts @@ -0,0 +1,32 @@ +import { Chance } from 'chance'; +import { KeyTypesTexts } from './constants'; + +export function getRandomKeyName(keyNameLength: number): string { + const chance = new Chance(); + let result = ''; + for (let i = 0; i < keyNameLength; i++) { + result += chance.character(); + } + return result; +} + +/** + * Create random paragraph with amount of sentences + * @param sentences The amount of sentences in paragraph + */ +export function getRandomParagraph(sentences: number): string { + const chance = new Chance(); + return chance.paragraph({ sentences: sentences }); +} + +export const keyTypes = [ + { textType: KeyTypesTexts.Hash, keyName: 'hash' }, + { textType: KeyTypesTexts.Set, keyName: 'set' }, + { textType: KeyTypesTexts.ZSet, keyName: 'zset' }, + { textType: KeyTypesTexts.List, keyName: 'list' }, + { textType: KeyTypesTexts.String, keyName: 'string' }, + { textType: KeyTypesTexts.Graph, keyName: 'graph' }, + { textType: KeyTypesTexts.ReJSON, keyName: 'json' }, + { textType: KeyTypesTexts.Stream, keyName: 'stream' }, + { textType: KeyTypesTexts.TimeSeries, keyName: 'timeSeries' } +] diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 49cecddb14..2620a9631b 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -23,8 +23,10 @@ "cli-argument-parser": "0.4.5" }, "devDependencies": { + "@types/chance": "1.1.3", "@typescript-eslint/eslint-plugin": "^2.25.0", "@typescript-eslint/parser": "^2.25.0", + "chance": "1.1.8", "cross-env": "^7.0.3", "eslint": "^6.8.0", "eslint-config-airbnb": "^18.2.0", diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts index 07d8d46711..3ed654473b 100644 --- a/tests/e2e/pageObjects/browser-page.ts +++ b/tests/e2e/pageObjects/browser-page.ts @@ -42,6 +42,7 @@ export class BrowserPage { addKeyNameInput: Selector keyNameInput: Selector keyTTLInput: Selector + ttlValueInKeysTable: Selector listKeyElementInput: Selector jsonKeyValueInput: Selector setMemberInput: Selector @@ -132,6 +133,7 @@ export class BrowserPage { this.editKeyTTLButton = Selector('[data-testid=edit-ttl-btn]'); this.closeEditTTL = Selector('[data-testid=cancel-btn]'); this.saveTTLValue = Selector('[data-testid=apply-btn]'); + this.ttlValueInKeysTable = Selector('[data-testid^=ttl-]'); this.refreshKeysButton = Selector('[data-testid=refresh-keys-btn]'); this.refreshKeyButton = Selector('[data-testid=refresh-key-btn]') this.applyButton = Selector('[data-testid=apply-btn]'); @@ -590,13 +592,13 @@ export class BrowserPage { * Add json structure * @param jsonStructure The structure of the json key */ - async addJsonSctucture(jsonStructure: string): Promise{ + async addJsonSctucture(jsonStructure: string): Promise{ await t.click(this.expandJsonObject); await t.click(this.editJsonObjectButton); await t.pressKey('ctrl+a delete'); await t.typeText(this.jsonValueInput, jsonStructure); await t.click(this.applyEditButton); -} + } /** * Get Values list of the key diff --git a/tests/e2e/pageObjects/cli-page.ts b/tests/e2e/pageObjects/cli-page.ts index 1a07d30d37..5fcaa9440e 100644 --- a/tests/e2e/pageObjects/cli-page.ts +++ b/tests/e2e/pageObjects/cli-page.ts @@ -35,6 +35,11 @@ export class CliPage { cliReadMoreRediSearchCommandDocumentation: Selector expandCommandHelperButton: Selector closeCommandHelperButton: Selector + commandHelperArea: Selector + minimizeCliButton: Selector + minimizeCommandHelperButton: Selector + cliBadge: Selector + commandHelperBadge: Selector constructor() { //------------------------------------------------------------------------------------------- @@ -51,6 +56,10 @@ export class CliPage { this.filterGroupTypeButton = Selector('[data-testid=select-filter-group-type]'); this.filterOptionGroupType = Selector('[data-test-subj^=filter-option-group-type-]'); this.readMoreButton = Selector('[data-testid=read-more]'); + this.minimizeCliButton = Selector('[data-testid=hide-cli]'); + this.minimizeCommandHelperButton = Selector('[data-testid=hide-command-helper]'); + this.cliBadge = Selector('[data-testid=expand-cli] span'); + this.commandHelperBadge = Selector('[data-testid=expand-command-helper] span'); // TEXT INPUTS (also referred to as 'Text fields') this.cliHelper = Selector('[data-testid=cli-helper]'); this.cliHelperText = Selector('[data-testid=cli-helper-default]'); @@ -70,6 +79,7 @@ export class CliPage { this.cliCommandExecuted = Selector('[data-testid=cli-command-wrapper]'); this.cliReadMoreJSONCommandDocumentation = Selector('[id=jsonset]'); this.cliReadMoreRediSearchCommandDocumentation = Selector('[id=ftexplain]'); + this.commandHelperArea = Selector('[data-testid=command-helper]'); } /** * Select filter group type @@ -81,11 +91,11 @@ export class CliPage { } /** - * Add keys from CLI - * @param keyCommand The command from cli to add key - * @param amount The amount of the keys - * @param keyName The name of the keys. The default value is keyName - */ + * Add keys from CLI + * @param keyCommand The command from cli to add key + * @param amount The amount of the keys + * @param keyName The name of the keys. The default value is keyName + */ async addKeysFromCli(keyCommand: string, amount: number, keyName = 'keyName'): Promise{ //Open CLI await t.click(this.cliExpandButton); @@ -95,4 +105,18 @@ export class CliPage { await t.pressKey('enter'); await t.click(this.cliCollapseButton); } + /** + * Get command result execution + * @param command The command for send in CLI + */ + async getSuccessCommandResultFromCli(command: string): Promise{ + //Open CLI + await t.click(this.cliExpandButton); + //Add keys + await t.typeText(this.cliCommandInput, command, { paste: true }); + await t.pressKey('enter'); + const commandResult = await this.cliOutputResponseSuccess.innerText; + await t.click(this.cliCollapseButton); + return commandResult; + } } diff --git a/tests/e2e/pageObjects/index.ts b/tests/e2e/pageObjects/index.ts index e77f470a2a..1810472707 100644 --- a/tests/e2e/pageObjects/index.ts +++ b/tests/e2e/pageObjects/index.ts @@ -9,6 +9,7 @@ import { WorkbenchPage } from './workbench-page'; import { DatabaseOverviewPage } from './database-overview-page'; import { HelpCenterPage } from './help-center-page'; import { ShortcutsPage } from './shortcuts-page'; +import { MonitorPage } from './monitor-page'; export { AddRedisDatabasePage, @@ -21,5 +22,6 @@ export { WorkbenchPage, DatabaseOverviewPage, HelpCenterPage, - ShortcutsPage + ShortcutsPage, + MonitorPage } diff --git a/tests/e2e/pageObjects/monitor-page.ts b/tests/e2e/pageObjects/monitor-page.ts new file mode 100644 index 0000000000..a2b24380d4 --- /dev/null +++ b/tests/e2e/pageObjects/monitor-page.ts @@ -0,0 +1,76 @@ +import {Selector, t} from 'testcafe'; + +export class MonitorPage { + + //------------------------------------------------------------------------------------------ + //DECLARATION OF TYPES: DOM ELEMENTS and UI COMPONENTS + //*Assign the 'Selector' type to any element/component nested within the constructor. + //------------------------------------------------------------------------------------------ + + expandMonitor: Selector + monitorArea: Selector + runMonitorToggle: Selector + startMonitorButton: Selector + clearMonitorButton: Selector + monitorIsStoppedText: Selector + monitorIsStartedText: Selector + hideMonitor: Selector + closeMonitor: Selector + monitorWarningMessage: Selector + monitorCommandLinePart: Selector + monitorCommandLineTimestamp: Selector + + constructor() { + //------------------------------------------------------------------------------------------- + //DECLARATION OF SELECTORS + //*Declare all elements/components of the relevant page. + //*Target any element/component via data-id, if possible! + //*The following categories are ordered alphabetically (Alerts, Buttons, Checkboxes, etc.). + //------------------------------------------------------------------------------------------- + //BUTTONS + this.expandMonitor = Selector('[data-testid=expand-monitor]'); + this.monitorArea = Selector('[data-testid=monitor]'); + this.runMonitorToggle = Selector('[data-testid=toggle-run-monitor]'); + this.startMonitorButton = Selector('[data-testid=start-monitor]'); + this.clearMonitorButton = Selector('[data-testid=clear-monitor]'); + this.monitorIsStoppedText = Selector('[data-testid=monitor-stopped]'); + this.monitorIsStartedText = Selector('[data-testid=monitor-started]'); + this.hideMonitor = Selector('[data-testid=hide-monitor]'); + this.closeMonitor = Selector('[data-testid=close-monitor]'); + this.monitorWarningMessage = Selector('[data-testid=monitor-warning-message]'); + this.monitorCommandLinePart = Selector('[data-testid=monitor] span'); + this.monitorCommandLineTimestamp = Selector('[data-testid=monitor] span').withText(/[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}/); + } + /** + * Check specific command in Monitor + * @param command A command which should be displayed in monitor + * @param parameters An arguments which should be displayed in monitor + */ + async checkCommandInMonitorResults(command: string, parameters?: string[]): Promise { + const commandArray = command.split(' '); + for (const value of commandArray) { + await t.expect(this.monitorCommandLinePart.withText(value).exists).ok({timeout: 6000}); + } + if (!!parameters) { + for (const argument of parameters) { + await t.expect(this.monitorCommandLinePart.withText(argument).exists).ok({timeout: 6000}); + } + } + } + /** + * Start monitor function + */ + async startMonitor(): Promise { + await t.click(this.expandMonitor); + await t.click(this.startMonitorButton); + //Check for "info" command that is sent automatically every 5 seconds from BE side + await this.checkCommandInMonitorResults('info'); + } + /** + * Stop monitor function + */ + async stopMonitor(): Promise { + await t.click(this.runMonitorToggle); + await t.expect(this.monitorIsStoppedText.exists).ok('Profiler is stopped text'); + } +} diff --git a/tests/e2e/pageObjects/my-redis-databases-page.ts b/tests/e2e/pageObjects/my-redis-databases-page.ts index 30737ccbb4..ef92de99cb 100644 --- a/tests/e2e/pageObjects/my-redis-databases-page.ts +++ b/tests/e2e/pageObjects/my-redis-databases-page.ts @@ -83,7 +83,7 @@ export class MyRedisDatabasePage { const count = await dbNames.count; for(let i = 0; i < count; i++) { - if((await dbNames.nth(1).innerText || '').includes(dbName)) { + if((await dbNames.nth(i).innerText || '').includes(dbName)) { await t.click(this.deleteDatabaseButton.nth(i)); await t.click(this.confirmDeleteButton); break; diff --git a/tests/e2e/pageObjects/workbench-page.ts b/tests/e2e/pageObjects/workbench-page.ts index 1876712db0..f105811f1d 100644 --- a/tests/e2e/pageObjects/workbench-page.ts +++ b/tests/e2e/pageObjects/workbench-page.ts @@ -6,10 +6,13 @@ export class WorkbenchPage { cssSelectorPaginationButtonNext: string cssReRunCommandButton: string cssDeleteCommandButton: string - cssQueryCardOutputResponceSuccess: string + cssQueryCardOutputResponseSuccess: string cssTableViewTypeOption: string + cssMonacoCommandPaletteLine: string cssQueryTextResult: string cssQueryTableResult: string + cssCustomPluginTableResult: string + cssCommandExecutionDateTime: string //------------------------------------------------------------------------------------------ //DECLARATION OF TYPES: DOM ELEMENTS and UI COMPONENTS //*Assign the 'Selector' type to any element/component nested within the constructor. @@ -45,6 +48,9 @@ export class WorkbenchPage { monacoCloseCommandDetails: Selector monacoSuggestion: Selector monacoCommandIndicator: Selector + monacoContextMenu: Selector + monacoShortcutInput: Selector + monacoSuggestionOption: Selector iframe: Selector internalLinkWorkingWithHashes: Selector preselectExactSearch: Selector @@ -58,6 +64,12 @@ export class WorkbenchPage { noCommandHistoryTitle: Selector noCommandHistoryText: Selector scrolledEnablementArea: Selector + enablementAreaPagination: Selector + enablementAreaPaginationPopover: Selector + paginationPopoverButtons: Selector + enablementAreaTreeView: Selector + fullScreenButton: Selector + customPluginsViewType: Selector constructor() { //CSS selectors @@ -65,10 +77,13 @@ export class WorkbenchPage { this.cssSelectorPaginationButtonNext = '[data-test-subj=pagination-button-next]'; this.cssReRunCommandButton = '[data-testid=re-run-command]'; this.cssDeleteCommandButton = '[data-testid=delete-command]'; - this.cssQueryCardOutputResponceSuccess = '[data-testid=query-card-output-response-success]'; + this.cssQueryCardOutputResponseSuccess = '[data-testid=query-card-output-response-success]'; this.cssTableViewTypeOption = '[data-testid=view-type-selected-Plugin-redisearch__redisearch]'; + this.cssMonacoCommandPaletteLine = '[aria-label="Command Palette"]'; this.cssQueryTextResult = '[data-testid=query-cli-result]'; this.cssQueryTableResult = '[data-testid^=query-table-result-]'; + this.cssCustomPluginTableResult = '[data-testid^=query-table-result-client]'; + this.cssCommandExecutionDateTime = '[data-testid=command-execution-date-time]'; //------------------------------------------------------------------------------------------- //DECLARATION OF SELECTORS //*Declare all elements/components of the relevant page. @@ -95,6 +110,9 @@ export class WorkbenchPage { this.reRunCommandButton = Selector('[data-testid=re-run-command]'); this.preselectManual = Selector('[data-testid=preselect-Manual]'); this.internalLinkWorkingWithHashes = Selector('[data-testid=internal-link-working-with-hashes]'); + this.enablementAreaPagination = Selector('[data-testid=enablement-area__pagination-popover-btn]'); + this.paginationPopoverButtons = Selector('[data-testid=enablement-area__pagination-popover] button'); + this.fullScreenButton = Selector('[data-testid=toggle-full-screen]'); // TEXT INPUTS (also referred to as 'Text fields') this.queryInput = Selector('[data-testid=query-input-container]'); this.scriptsLines = Selector('[data-testid=query-input-container] .view-lines'); @@ -111,6 +129,9 @@ export class WorkbenchPage { this.monacoCommandDetails = Selector('div.suggest-details-container'); this.monacoCloseCommandDetails = Selector('span.codicon-close'); this.monacoSuggestion = Selector('span.monaco-icon-name-container'); + this.monacoContextMenu = Selector('div.shadow-root-host').shadowRoot(); + this.monacoShortcutInput = Selector('input.input'); + this.monacoSuggestionOption = Selector('div.monaco-list-row'); this.iframe = Selector('[data-testid=pluginIframe]', { timeout: 60000 }); this.monacoHintWithArguments = Selector('[widgetid="editor.widget.parameterHintsWidget"]'); this.noCommandHistorySection = Selector('[data-testid=wb_no-results]'); @@ -120,7 +141,10 @@ export class WorkbenchPage { this.noCommandHistoryTitle = Selector ('[data-testid=wb_no-results__title]'); this.noCommandHistoryText = Selector ('[data-testid=wb_no-results__summary]'); this.monacoCommandIndicator = Selector('div.monaco-glyph-run-command'); - this.scrolledEnablementArea = Selector('[data-testid=enablement-area__page]') + this.scrolledEnablementArea = Selector('[data-testid=enablement-area__page]'); + this.enablementAreaPaginationPopover = Selector('[data-testid=enablement-area__pagination-popover]'); + this.enablementAreaTreeView = Selector('[data-testid=enablementArea-treeView]'); + this.customPluginsViewType = Selector('[data-test-subj*=clients-list]'); } /** @@ -139,17 +163,17 @@ export class WorkbenchPage { //Select Table view option in Workbench results async selectViewTypeTable(): Promise{ - await t.click(this.selectViewType); - await t.click(this.tableViewTypeOption); -} + await t.click(this.selectViewType); + await t.click(this.tableViewTypeOption); + } /** * Send a command in Workbench * @param command The command * @param speed The speed in seconds. Default is 1 */ - async sendCommandInWorkbench(command: string, speed = 1): Promise{ - await t.typeText(this.queryInput, command, { replace: true, speed: speed}); + async sendCommandInWorkbench(command: string, speed = 1, paste = false): Promise{ + await t.typeText(this.queryInput, command, { replace: true, speed, paste }); await t.click(this.submitCommandButton); } @@ -158,7 +182,7 @@ export class WorkbenchPage { * @param commands The array of commands to send */ async sendCommandsArrayInWorkbench(commands: string[]): Promise { - for(let command of commands) { + for(const command of commands) { await this.sendCommandInWorkbench(command); } } diff --git a/tests/e2e/rte/oss-standalone-big/Dockerfile b/tests/e2e/rte/oss-standalone-big/Dockerfile new file mode 100644 index 0000000000..66b7369068 --- /dev/null +++ b/tests/e2e/rte/oss-standalone-big/Dockerfile @@ -0,0 +1,10 @@ +FROM redislabs/redismod + +ARG TEST_DB_DUMP +ADD $TEST_DB_DUMP /data/ + +ADD entrypoint.sh . +RUN chmod +x entrypoint.sh + +ENTRYPOINT ["sh", "entrypoint.sh", "redis-server"] +CMD ["--loadmodule", "/usr/lib/redis/modules/redisai.so", "--loadmodule", "/usr/lib/redis/modules/redisearch.so", "--loadmodule", "/usr/lib/redis/modules/redisgraph.so", "--loadmodule", "/usr/lib/redis/modules/redistimeseries.so", "--loadmodule", "/usr/lib/redis/modules/rejson.so", "--loadmodule", "/usr/lib/redis/modules/redisbloom.so", "--loadmodule", "/usr/lib/redis/modules/redisgears.so", "Plugin", "/var/opt/redislabs/modules/rg/plugin/gears_python.so"] diff --git a/tests/e2e/rte/oss-standalone-big/entrypoint.sh b/tests/e2e/rte/oss-standalone-big/entrypoint.sh new file mode 100644 index 0000000000..de1dcd8155 --- /dev/null +++ b/tests/e2e/rte/oss-standalone-big/entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -e dump.tar.gz ] +then + echo 'Extracting .rdb file...' + tar -zxvf dump.tar.gz +fi + +exec "$@" diff --git a/tests/e2e/tests/critical-path/browser/filtering.e2e.ts b/tests/e2e/tests/critical-path/browser/filtering.e2e.ts index 0d27c3a2ee..bae8e422f7 100644 --- a/tests/e2e/tests/critical-path/browser/filtering.e2e.ts +++ b/tests/e2e/tests/critical-path/browser/filtering.e2e.ts @@ -11,6 +11,7 @@ import { ossStandaloneConfig } from '../../../helpers/conf'; import { COMMANDS_TO_CREATE_KEY, KeyTypesTexts } from '../../../helpers/constants'; +import { keyTypes } from '../../../helpers/keys'; const myRedisDatabasePage = new MyRedisDatabasePage(); const browserPage = new BrowserPage(); @@ -18,18 +19,6 @@ const userAgreementPage = new UserAgreementPage(); const addRedisDatabasePage = new AddRedisDatabasePage(); const cliPage = new CliPage(); -const filteringTypes = [ - { textType: KeyTypesTexts.Hash, keyName: 'hash' }, - { textType: KeyTypesTexts.Set, keyName: 'set' }, - { textType: KeyTypesTexts.ZSet, keyName: 'zset' }, - { textType: KeyTypesTexts.List, keyName: 'list' }, - { textType: KeyTypesTexts.String, keyName: 'string' }, - { textType: KeyTypesTexts.Graph, keyName: 'graph' }, - { textType: KeyTypesTexts.ReJSON, keyName: 'json' }, - { textType: KeyTypesTexts.Stream, keyName: 'stream' }, - { textType: KeyTypesTexts.TimeSeries, keyName: 'timeSeries' } -] - fixture `Filtering per key name in Browser page` .meta({type: 'critical_path'}) .page(commonUrl) @@ -64,7 +53,7 @@ test('Verify that user can filter keys per data type in Browser page', async t = //Create new keys await t.click(cliPage.cliExpandButton); - for (const { textType, keyName } of filteringTypes) { + for (const { textType, keyName } of keyTypes) { if (textType in COMMANDS_TO_CREATE_KEY) { await t.typeText(cliPage.cliCommandInput, COMMANDS_TO_CREATE_KEY[textType](keyName)); await t.pressKey('enter'); @@ -72,7 +61,7 @@ test('Verify that user can filter keys per data type in Browser page', async t = } await t.click(cliPage.cliCollapseButton); - for (const { textType, keyName } of filteringTypes) { + for (const { textType, keyName } of keyTypes) { await browserPage.selectFilterGroupType(textType); const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList(keyName); await t.expect(isKeyIsDisplayedInTheList).ok(`The key of type ${textType} was found`); diff --git a/tests/e2e/tests/critical-path/cli/cli-command-helper.e2e.ts b/tests/e2e/tests/critical-path/cli/cli-command-helper.e2e.ts index 6f98978098..be3a83a72e 100644 --- a/tests/e2e/tests/critical-path/cli/cli-command-helper.e2e.ts +++ b/tests/e2e/tests/critical-path/cli/cli-command-helper.e2e.ts @@ -124,7 +124,7 @@ test('Verify that user can type TS. in Command helper and see commands from Redi //Select group from list and remeber commands await cliPage.selectFilterGroupType(COMMAND_GROUP_TIMESERIES); const commandsFilterCount = await cliPage.cliHelperOutputTitles.count; - let timeSeriesCommands = []; + const timeSeriesCommands = []; for(let i = 0; i < commandsFilterCount; i++) { timeSeriesCommands.push(await cliPage.cliHelperOutputTitles.nth(i).textContent); } @@ -146,7 +146,7 @@ test('Verify that user can type GRAPH. in Command helper and see auto-suggestion //Select group from list and remeber commands await cliPage.selectFilterGroupType(COMMAND_GROUP_GRAPH); const commandsFilterCount = await cliPage.cliHelperOutputTitles.count; - let graphCommands = []; + const graphCommands = []; for(let i = 0; i < commandsFilterCount; i++) { graphCommands.push(await cliPage.cliHelperOutputTitles.nth(i).textContent); } diff --git a/tests/e2e/tests/critical-path/monitor/monitor.e2e.ts b/tests/e2e/tests/critical-path/monitor/monitor.e2e.ts new file mode 100644 index 0000000000..7093aaab1c --- /dev/null +++ b/tests/e2e/tests/critical-path/monitor/monitor.e2e.ts @@ -0,0 +1,90 @@ +import { addNewStandaloneDatabase } from '../../../helpers/database'; +import { + MyRedisDatabasePage, + UserAgreementPage, + AddRedisDatabasePage, + CliPage, + MonitorPage, + WorkbenchPage, + BrowserPage +} from '../../../pageObjects'; +import { + commonUrl, + ossStandaloneConfig +} from '../../../helpers/conf'; +import { getRandomKeyName } from '../../../helpers/keys'; + +const myRedisDatabasePage = new MyRedisDatabasePage(); +const userAgreementPage = new UserAgreementPage(); +const addRedisDatabasePage = new AddRedisDatabasePage(); +const cliPage = new CliPage(); +const monitorPage = new MonitorPage(); +const workbenchPage = new WorkbenchPage(); +const browserPage = new BrowserPage(); +const keyName = `${getRandomKeyName(10)}-key`; +const keyValue = `${getRandomKeyName(10)}-value`; + +fixture `Monitor` + .meta({ type: 'critical_path' }) + .page(commonUrl) + .beforeEach(async t => { + await t.maximizeWindow(); + await userAgreementPage.acceptLicenseTerms(); + await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('The add redis database view', { timeout: 20000 }); + await addNewStandaloneDatabase(ossStandaloneConfig); + await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); + }) + .afterEach(async t => { + await t.click(myRedisDatabasePage.myRedisDBButton); + await myRedisDatabasePage.deleteDatabaseByName(ossStandaloneConfig.databaseName); + }) +test + .after(async t => { + await browserPage.deleteKeyByName(keyName); + await t.click(myRedisDatabasePage.myRedisDBButton); + await myRedisDatabasePage.deleteDatabaseByName(ossStandaloneConfig.databaseName); + }) + ('Verify that user can work with Monitor', async t => { + const command = 'set'; + //Verify that user can open Monitor + await t.click(monitorPage.expandMonitor); + //Check that monitor is opened + await t.expect(monitorPage.monitorArea.exists).ok('Profiler area'); + await t.expect(monitorPage.startMonitorButton.exists).ok('Start profiler button'); + //Verify that user can see message inside Monitor "Running Monitor will decrease throughput, avoid running it in production databases." when opens it for the first time + await t.expect(monitorPage.monitorWarningMessage.exists).ok('Profiler warning message'); + await monitorPage.monitorWarningMessage.withText('Running Profiler will decrease throughput, avoid running it in production databases'); + //Verify that user can run Monitor by clicking "Run" command in the message inside Monitor + await t.click(monitorPage.startMonitorButton); + await t.expect(monitorPage.monitorIsStartedText.innerText).eql('Profiler is started.'); + //Verify that user can see run commands in monitor + await cliPage.getSuccessCommandResultFromCli(`${command} ${keyName} ${keyValue}`); + await monitorPage.checkCommandInMonitorResults(command, [keyName, keyValue]); + }); +test('Verify that user can see the list of all commands from all clients ran for this Redis database in the list of results in Monitor', async t => { + //Define commands in different clients + const cli_command = 'command'; + const workbench_command = 'hello'; + const common_command = 'info'; + const browser_command = 'dbsize'; + //Expand Monitor panel + await t.click(monitorPage.expandMonitor); + //Start monitor (using run button in header) + await t.click(monitorPage.runMonitorToggle); + //Send command in CLI + await cliPage.getSuccessCommandResultFromCli(cli_command); + //Check that command from CLI is displayed in monitor + await monitorPage.checkCommandInMonitorResults(cli_command); + //Refresh the page to send command from Browser client + await t.click(browserPage.refreshKeysButton); + //Check the command from browser client + await monitorPage.checkCommandInMonitorResults(browser_command); + //Open Workbench page to create new client + await t.click(myRedisDatabasePage.workbenchButton); + //Send command in Workbench + await workbenchPage.sendCommandInWorkbench(workbench_command); + //Check that command from Workbench is displayed in monitor + await monitorPage.checkCommandInMonitorResults(workbench_command); + //Check the command from common client + await monitorPage.checkCommandInMonitorResults(common_command); +}); diff --git a/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts b/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts index b61599ac25..58a0afb7dd 100644 --- a/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts +++ b/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts @@ -36,7 +36,7 @@ test('Verify that user can select a command from the list with auto-suggestions //Select command and check result await t.pressKey('enter'); const script = await workbenchPage.queryInputScriptArea.textContent; - await t.expect(script.replace(/\s/g, ' ')).eql('ACL CAT ', 'Result of sent command exists'); + await t.expect(script.replace(/\s/g, ' ')).eql('ACL ', 'Result of sent command exists'); }); test('Verify that when user have selected a command (via “Enter” from the list of auto-suggested commands), user can see the required arguments inserted to the Editor', async t => { const command = 'LINDEX' diff --git a/tests/e2e/tests/critical-path/workbench/command-results.e2e.ts b/tests/e2e/tests/critical-path/workbench/command-results.e2e.ts index 9c5a657dd9..3c0027740d 100644 --- a/tests/e2e/tests/critical-path/workbench/command-results.e2e.ts +++ b/tests/e2e/tests/critical-path/workbench/command-results.e2e.ts @@ -1,6 +1,5 @@ import { addNewStandaloneDatabase } from '../../../helpers/database'; -import { WorkbenchPage } from '../../../pageObjects/workbench-page'; -import { MyRedisDatabasePage, UserAgreementPage, AddRedisDatabasePage } from '../../../pageObjects'; +import { MyRedisDatabasePage, UserAgreementPage, AddRedisDatabasePage, WorkbenchPage } from '../../../pageObjects'; import { commonUrl, ossStandaloneConfig @@ -13,6 +12,7 @@ const workbenchPage = new WorkbenchPage(); const commandForSend1 = 'info'; const commandForSend2 = 'FT._LIST'; +const indexName = 'idx'; fixture `Command results at Workbench` .meta({type: 'critical_path'}) @@ -29,7 +29,8 @@ fixture `Command results at Workbench` }) .afterEach(async t => { //Drop index and documents - await workbenchPage.sendCommandInWorkbench('FT.DROPINDEX products DD'); + await t.switchToMainWindow(); + await workbenchPage.sendCommandInWorkbench(`FT.DROPINDEX ${indexName} DD`); }) test('Verify that user can see re-run icon near the already executed command and re-execute the command by clicking on the icon in Workbench page', async t => { //Send commands @@ -51,7 +52,7 @@ test('Verify that user can see expanded result after command re-run at the top o const containerOfCommand = await workbenchPage.getCardContainerByCommand(commandForSend1); await t.click(containerOfCommand.find(workbenchPage.cssReRunCommandButton)); //Verify that re-executed command is expanded - await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryCardOutputResponceSuccess).visible).ok('Re-executed command is expanded'); + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryCardOutputResponseSuccess).visible).ok('Re-executed command is expanded'); //Verify that re-executed command is at the top of results await t.expect(workbenchPage.queryCardCommand.nth(0).textContent).eql(commandForSend1, 'The re-executed command is at the top of results table'); }); @@ -71,8 +72,47 @@ test('Verify that user can see the results found in the table view by default fo 'FT.AGGREGATE' ]; //Send commands and check table view is default - for(let command of commands) { + for(const command of commands) { await workbenchPage.sendCommandInWorkbench(command); await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssTableViewTypeOption).visible).ok(`The table view is selected by default for command ${command}`); } }); +//skipped due the inaccessibility of the iframe +test.skip('Verify that user can switches between views and see results according to the view rules in Workbench in results', async t => { + const commands = [ + 'hset doc:10 title "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud" url "redis.io" author "Test" rate "undefined" review "0" comment "Test comment"', + `FT.CREATE ${indexName} ON HASH PREFIX 1 doc: SCHEMA title TEXT WEIGHT 5.0 body TEXT url TEXT author TEXT rate TEXT review TEXT comment TEXT`, + `FT.SEARCH ${indexName} * limit 0 10000` + ]; + //Send commands and check table view is default for Search command + for(let command of commands) { + await workbenchPage.sendCommandInWorkbench(command); + } + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssTableViewTypeOption).visible).ok('The table view is selected by default for command FT.SEARCH'); + await t.switchToIframe(workbenchPage.iframe); + await t.expect(await workbenchPage.queryTableResult.visible).ok('The table result is displayed for command FT.SEARCH'); + //Select Text view and check result + await t.switchToMainWindow(); + await workbenchPage.selectViewTypeText(); + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The result is displayed in Text view'); +}); +test('Verify that user can see all views (custom+default) in the control to change the views in Workbench (number of views are not limited)', async t => { + const command = 'CLIENT LIST'; + //Send command and check custom view in the control + await workbenchPage.sendCommandInWorkbench(command); + await t.click(workbenchPage.selectViewType); + await t.expect(await workbenchPage.customPluginsViewType.visible).ok('The custom view type option is in the control to change the views'); + await t.expect(await workbenchPage.textViewTypeOption.visible).ok('The default text view type option is in the control to change the views'); +}); +//skipped due the inaccessibility of the iframe +test.skip('Verify that user can switches between Table and Text for Client List and see results corresponding to their views', async t => { + const command = 'CLIENT LIST'; + //Send command and check table view is default + await workbenchPage.sendCommandInWorkbench(command); + await t.switchToIframe(workbenchPage.iframe); + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssCustomPluginTableResult).visible).ok('The search results are displayed in Custom Table view by default'); + //Select Text view from dropdown and check search results + await t.switchToMainWindow(); + await workbenchPage.selectViewTypeText(); + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The result is displayed in Text view'); +}); diff --git a/tests/e2e/tests/regression/browser/ttl-format.e2e.ts b/tests/e2e/tests/regression/browser/ttl-format.e2e.ts new file mode 100644 index 0000000000..d167e5263b --- /dev/null +++ b/tests/e2e/tests/regression/browser/ttl-format.e2e.ts @@ -0,0 +1,63 @@ +import { Selector } from 'testcafe'; +import { addNewStandaloneDatabase } from '../../../helpers/database'; +import { keyTypes, getRandomKeyName } from '../../../helpers/keys'; +import {COMMANDS_TO_CREATE_KEY, keyLength} from '../../../helpers/constants'; +import { + MyRedisDatabasePage, + BrowserPage, + UserAgreementPage, + CliPage, + AddRedisDatabasePage +} from '../../../pageObjects'; +import { + commonUrl, + ossStandaloneConfig +} from '../../../helpers/conf'; + +const myRedisDatabasePage = new MyRedisDatabasePage(); +const browserPage = new BrowserPage(); +const userAgreementPage = new UserAgreementPage(); +const addRedisDatabasePage = new AddRedisDatabasePage(); +const cliPage = new CliPage(); +const keysData = keyTypes.slice(0, 6); +for (const key of keysData) { + key.keyName = `${key.keyName}` + '-' + `${getRandomKeyName(keyLength)}` +} +//Arrays with TTL in seconds, min, hours, days, months, years and their values in Browser Page +const ttlForSet = [59, 800, 20000, 2000000, 31000000, 2147483647]; +const ttlValues = ['s', '13 min', '5 h', '23 d', '11 mo', '68 yr']; + +fixture `TTL values in Keys Table` + .meta({ type: 'regression' }) + .page(commonUrl) + .beforeEach(async t => { + await t.maximizeWindow(); + await userAgreementPage.acceptLicenseTerms(); + await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('The add redis database view', { timeout: 20000 }); + await addNewStandaloneDatabase(ossStandaloneConfig); + await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); + }) + .afterEach(async t => { + //Flush DB + await t.click(cliPage.cliExpandButton); + await t.typeText(cliPage.cliCommandInput, 'FLUSHDB'); + await t.pressKey('enter'); + }); +test('Verify that user can see TTL in the list of keys rounded down to the nearest unit', async t => { + //Create new keys with TTL + await t.click(cliPage.cliExpandButton); + for (let i = 0; i < keysData.length; i++) { + await t.typeText(cliPage.cliCommandInput, COMMANDS_TO_CREATE_KEY[keysData[i].textType](keysData[i].keyName)); + await t.pressKey('enter'); + await t.typeText(cliPage.cliCommandInput, `EXPIRE ${keysData[i].keyName} ${ttlForSet[i]}`); + await t.pressKey('enter'); + } + await t.click(cliPage.cliCollapseButton); + //Refresh Keys in Browser + await t.click(browserPage.refreshKeysButton); + //Check that Keys has correct TTL value in keys table + for (let i = 0; i < keysData.length; i++) { + const ttlValueElement = Selector(`[data-testid="ttl-${keysData[i].keyName}"]`); + await t.expect(ttlValueElement.textContent).contains(ttlValues[i], 'TTL value in keys table'); + } +}); diff --git a/tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts b/tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts index 06a2cd56e4..6994a7486b 100644 --- a/tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts +++ b/tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts @@ -1,20 +1,14 @@ import { ClientFunction } from 'testcafe'; -import { addNewStandaloneDatabase } from '../../../helpers/database' -import { - MyRedisDatabasePage, - UserAgreementPage, - CliPage, - AddRedisDatabasePage -} from '../../../pageObjects'; +import { acceptLicenseTermsAndAddDatabase } from '../../../helpers/database'; +import { Common } from '../../../helpers/common'; +import { CliPage } from '../../../pageObjects'; import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf'; -const myRedisDatabasePage = new MyRedisDatabasePage(); const cliPage = new CliPage(); -const userAgreementPage = new UserAgreementPage(); -const addRedisDatabasePage = new AddRedisDatabasePage(); +const common = new Common(); const COMMAND_GROUP_JSON = 'JSON'; const COMMAND_GROUP_SEARCH = 'Search'; const COMMAND_GROUP_HyperLogLog = 'HyperLogLog'; @@ -22,18 +16,14 @@ const COMMAND_GROUP_HyperLogLog = 'HyperLogLog'; fixture `CLI Command helper` .meta({ type: 'regression' }) .page(commonUrl) - .beforeEach(async t => { - await t.maximizeWindow(); - await userAgreementPage.acceptLicenseTerms(); - await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('The add redis database view', { timeout: 20000 }); - await addNewStandaloneDatabase(ossStandaloneConfig); + .beforeEach(async() => { + await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName); }) const getPageUrl = ClientFunction(() => window.location.href); test('Verify that user can see in Command helper and click on new group "JSON", can choose it and see list of commands in the group', async t => { const commandForCheck = 'JSON.SET'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); //Open Command Helper await t.click(cliPage.expandCommandHelperButton); //Select one command from the list @@ -50,7 +40,6 @@ test('Verify that user can see in Command helper and click on new group "JSON", }); test('Verify that user can see in Command helper and click on new group "Search", can choose it and see list of commands in the group', async t => { const commandForCheck = 'FT.EXPLAIN'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); //Open Command Helper await t.click(cliPage.expandCommandHelperButton); //Select one command from the list @@ -67,7 +56,6 @@ test('Verify that user can see in Command helper and click on new group "Search" }); test('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => { const commandForCheck = 'PFCOUNT'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); //Open Command Helper await t.click(cliPage.expandCommandHelperButton); //Select one command from the list @@ -105,7 +93,6 @@ test('Verify that user can see all separated groups for AI json file (model, ten '/#aiscriptexecute', '/#aitensorset' ]; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); //Open Command Helper await t.click(cliPage.expandCommandHelperButton); let i = 0; @@ -125,3 +112,52 @@ test('Verify that user can see all separated groups for AI json file (model, ten i++; } }); +test('Verify that user can open/close CLI separately from Command Helper', async t => { + //Open CLI + await t.click(cliPage.cliExpandButton); + //Verify that CLI is opened separately + await t.expect(cliPage.commandHelperArea.visible).notOk('Command Helper is closed'); + await t.expect(cliPage.cliCollapseButton.visible).ok('CLI is opended'); + //Open Command Helper + await t.click(cliPage.expandCommandHelperButton); + //Verify that user can close CLI separately + await t.click(cliPage.cliCollapseButton); + await t.expect(cliPage.commandHelperArea.visible).ok('Command Helper is displayed'); + await t.expect(cliPage.cliCollapseButton.visible).notOk('CLI is closed'); +}); +test('Verify that user can open/close Command Helper separately from CLI', async t => { + //Open Command Helper + await t.click(cliPage.expandCommandHelperButton); + //Verify that Command Helper is opened separately + await t.expect(cliPage.commandHelperArea.visible).ok('Command Helper is opened'); + await t.expect(cliPage.cliCollapseButton.visible).notOk('CLI is closed'); + //Open CLI + await t.click(cliPage.cliExpandButton); + //Verify that Command Helper is closed separately + await t.click(cliPage.closeCommandHelperButton); + await t.expect(cliPage.commandHelperArea.visible).notOk('Command Helper is closed'); + await t.expect(cliPage.cliCollapseButton.visible).ok('CLI is opended'); +}); +test('Verify that user can see that Command Helper is minimized when he clicks the "minimize" button', async t => { + const helperColourBefore = await common.getBackgroundColour(cliPage.commandHelperBadge); + //Open Command Helper and minimize + await t.click(cliPage.expandCommandHelperButton); + await t.click(cliPage.minimizeCommandHelperButton); + //Verify Command helper is minimized + const helperColourAfter = await common.getBackgroundColour(cliPage.commandHelperBadge); + await t.expect(helperColourAfter).notEql(helperColourBefore, 'Command helper badge colour is changed'); + await t.expect(cliPage.minimizeCliButton.visible).eql(false, 'Command helper is mimized'); +}); +test('Verify that user can see that Command Helper displays the previous information when he re-opens it', async t => { + const commandForCheck = 'FT.EXPLAIN'; + //Open Command Helper + await t.click(cliPage.expandCommandHelperButton); + //Select one command from the list + await cliPage.selectFilterGroupType(COMMAND_GROUP_SEARCH); + await t.click(cliPage.cliHelperOutputTitles.withExactText(commandForCheck)); + //Minimize and re-open Command Helper + await t.click(cliPage.minimizeCommandHelperButton); + await t.click(cliPage.expandCommandHelperButton); + //Verify Command helper information + await t.expect(cliPage.cliHelperTitleArgs.textContent).contains(commandForCheck, 'Command Helper information persists after reopening'); +}); diff --git a/tests/e2e/tests/regression/cli/cli.e2e.ts b/tests/e2e/tests/regression/cli/cli.e2e.ts new file mode 100644 index 0000000000..a35ad551c2 --- /dev/null +++ b/tests/e2e/tests/regression/cli/cli.e2e.ts @@ -0,0 +1,55 @@ +import { acceptLicenseTermsAndAddDatabase } from '../../../helpers/database'; +import { Common } from '../../../helpers/common'; +import { CliPage } from '../../../pageObjects'; +import { + commonUrl, + ossStandaloneConfig +} from '../../../helpers/conf'; + +const cliPage = new CliPage(); +const common = new Common(); + +fixture `CLI` + .meta({ type: 'regression' }) + .page(commonUrl) + .beforeEach(async() => { + await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName); + }) +test('Verify that user can see CLI is minimized when he clicks the "minimize" button', async t => { + const cliColourBefore = await common.getBackgroundColour(cliPage.cliBadge); + //Open CLI and minimize + await t.click(cliPage.cliExpandButton); + await t.click(cliPage.minimizeCliButton); + //Verify cli is minimized + const cliColourAfter = await common.getBackgroundColour(cliPage.cliBadge); + await t.expect(cliColourAfter).notEql(cliColourBefore, 'CLI badge colour is changed'); + await t.expect(cliPage.minimizeCliButton.visible).eql(false, 'CLI is mimized'); +}); +test('Verify that user can see results history when he re-opens CLI after minimizing', async t => { + const command = 'SET key'; + //Open CLI and run commands + await t.click(cliPage.cliExpandButton); + await t.typeText(cliPage.cliCommandInput, command); + await t.pressKey('enter'); + //Minimize and re-open cli + await t.click(cliPage.minimizeCliButton); + await t.click(cliPage.cliExpandButton); + //Verify cli results history + await t.expect(cliPage.cliCommandExecuted.textContent).eql(command, 'CLI results history persists after reopening'); +}); +test + .after(async t => { + //Clear database + await t.typeText(cliPage.cliCommandInput, 'FLUSHDB'); + await t.pressKey('enter'); + }) + ('Verify that user can repeat commands by entering a number of repeats before the Redis command in CLI', async t => { + const command = 'SET a a'; + const repeats = 10; + //Open CLI and run command with repeats + await t.click(cliPage.cliExpandButton); + await t.typeText(cliPage.cliCommandInput, `${repeats} ${command}`); + await t.pressKey('enter'); + //Verify result + await t.expect(cliPage.cliOutputResponseSuccess.count).eql(repeats, `CLI contains ${repeats} results`); +}); diff --git a/tests/e2e/tests/regression/monitor/monitor.e2e.ts b/tests/e2e/tests/regression/monitor/monitor.e2e.ts new file mode 100644 index 0000000000..734ec69c9e --- /dev/null +++ b/tests/e2e/tests/regression/monitor/monitor.e2e.ts @@ -0,0 +1,112 @@ +import { Chance } from 'chance'; +import { addNewStandaloneDatabase } from '../../../helpers/database'; +import { + MyRedisDatabasePage, + UserAgreementPage, + AddRedisDatabasePage, + MonitorPage, + SettingsPage, + BrowserPage +} from '../../../pageObjects'; +import { + commonUrl, ossBigStandaloneConfig, + ossStandaloneConfig +} from '../../../helpers/conf'; + +const myRedisDatabasePage = new MyRedisDatabasePage(); +const userAgreementPage = new UserAgreementPage(); +const addRedisDatabasePage = new AddRedisDatabasePage(); +const monitorPage = new MonitorPage(); +const settingsPage = new SettingsPage(); +const browserPage = new BrowserPage(); +const chance = new Chance(); + +fixture `Monitor` + .meta({ type: 'regression' }) + .page(commonUrl) + .beforeEach(async t => { + await t.maximizeWindow(); + await userAgreementPage.acceptLicenseTerms(); + await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('The add redis database view', { timeout: 20000 }); + await addNewStandaloneDatabase(ossStandaloneConfig); + await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); + }) + .afterEach(async t => { + await t.click(myRedisDatabasePage.myRedisDBButton); + await myRedisDatabasePage.deleteDatabaseByName(ossStandaloneConfig.databaseName); + }) +test('Verify that when user closes the Monitor by clicking on "Close Monitor" button Monitor stopped', async t => { + //Run monitor + await monitorPage.startMonitor(); + //Close Monitor + await t.click(monitorPage.closeMonitor); + //Verify that monitor is not displayed + await t.expect(monitorPage.monitorArea.visible).notOk('Profiler area'); + //Verify that user open monitor again + await t.click(monitorPage.expandMonitor); + //Verify that when user reopens Monitor history is not displayed + await t.expect(monitorPage.startMonitorButton.visible).ok('Start profiler button'); +}); +test('Verify that Monitor is stopped when user clicks on "Stop" button', async t => { + //Run monitor + await monitorPage.startMonitor(); + //Click on Stop Monitor button + await t.click(monitorPage.runMonitorToggle); + //Check for "Monitor is stopped." text + await t.expect(monitorPage.monitorIsStoppedText.innerText).eql('Profiler is stopped.'); + //Check that no commands are displayed after "Monitor is stopped" text + await t.expect(monitorPage.monitorIsStoppedText.nextSibling().exists).notOk('No commands in monitor'); +}); +test('Verify that when user refreshes the page the list of results in Monitor is not saved', async t => { + //Run monitor + await monitorPage.startMonitor(); + //Refresh the page + await t.eval(() => location.reload(true)); + //Check that monitor is closed + await t.expect(monitorPage.monitorArea.exists).notOk('Monitor area'); + //Check that monitor area doesn't have any saved results + await t.click(monitorPage.expandMonitor); + await t.expect(monitorPage.monitorWarningMessage.exists).ok('Warning message in monitor'); +}); +test('Verify that when user clicks on "Clear" button in Monitor, all commands history is removed', async t => { + //Run monitor + await monitorPage.startMonitor(); + //Stop Monitor + await monitorPage.stopMonitor(); + //Click on Clear button + await t.click(monitorPage.clearMonitorButton); + //Check that monitor has start screen + await t.expect(monitorPage.startMonitorButton.exists).ok('Start monitor button'); +}); +test + .before(async t => { + await t.maximizeWindow(); + await userAgreementPage.acceptLicenseTerms(); + await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('Add Redis database view', { timeout: 20000 }); + await addNewStandaloneDatabase(ossBigStandaloneConfig); + await t.click(myRedisDatabasePage.settingsButton); + await t.click(settingsPage.accordionAdvancedSettings); + await settingsPage.changeKeysToScanValue('20000000'); + await t.click(myRedisDatabasePage.myRedisDBButton); + await myRedisDatabasePage.clickOnDBByName(ossBigStandaloneConfig.databaseName); + }) + .after(async t => { + await t.click(myRedisDatabasePage.settingsButton); + await t.click(settingsPage.accordionAdvancedSettings); + await settingsPage.changeKeysToScanValue('10000'); + await t.click(myRedisDatabasePage.myRedisDBButton); + await myRedisDatabasePage.deleteDatabaseByName(ossBigStandaloneConfig.databaseName); + }) + ('Verify that user can see monitor results in high DB load', async t => { + //Run monitor + await monitorPage.startMonitor(); + //Search by not existed key pattern + await browserPage.searchByKeyName(`${chance.string({ length:10 })}*`); + //Check that the last child is updated + for (let i = 0; i <= 10; i++) { + const previousTimestamp = await monitorPage.monitorCommandLineTimestamp.nth(-1).textContent; + await t.wait(5500); + const nextTimestamp = await monitorPage.monitorCommandLineTimestamp.nth(-1).textContent; + await t.expect(previousTimestamp).notEql(nextTimestamp); + } + }); diff --git a/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts b/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts index dc78d07998..67c100dcb3 100644 --- a/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts +++ b/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts @@ -31,11 +31,11 @@ fixture `Autocomplete for entered commands` test('Verify that user can open the "read more" about the command by clicking on the ">" icon or "ctrl+space"', async t => { const command = 'HSET' const commandDetails = [ - 'HSET key field value [field value ...]', + 'HSET key field_value [field_value ...]', 'Set the string value of a hash field', 'Arguments:', 'required key', - 'multiple field value' + 'multiple field_value' ]; //Type command await t.typeText(workbenchPage.queryInput, command, { replace: true }); diff --git a/tests/e2e/tests/regression/workbench/command-results.e2e.ts b/tests/e2e/tests/regression/workbench/command-results.e2e.ts index cf99449cb4..e9472c00cd 100644 --- a/tests/e2e/tests/regression/workbench/command-results.e2e.ts +++ b/tests/e2e/tests/regression/workbench/command-results.e2e.ts @@ -61,3 +61,16 @@ test('Verify that user can switches between Table and Text for FT.AGGREGATE and await workbenchPage.selectViewTypeTable(); await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTableResult).exists).ok(`The table view is switched for command FT.AGGREGATE`); }); +test('Verify that user can switches between views and see results according to this view in full mode in Workbench', async t => { + const command = 'CLIENT LIST'; + //Send command and check table view is default in full mode + await workbenchPage.sendCommandInWorkbench(command); + await t.click(workbenchPage.fullScreenButton); + await t.switchToIframe(workbenchPage.iframe); + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTableResult).visible).ok('The search results are displayed in Table view by default'); + //Select Text view from dropdown + await t.switchToMainWindow(); + await workbenchPage.selectViewTypeText(); + //Verify that search results are displayed in Text view + await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The result is displayed in Text view'); +}); diff --git a/tests/e2e/tests/regression/workbench/context.e2e.ts b/tests/e2e/tests/regression/workbench/context.e2e.ts index 0b6333c576..1f937346fa 100644 --- a/tests/e2e/tests/regression/workbench/context.e2e.ts +++ b/tests/e2e/tests/regression/workbench/context.e2e.ts @@ -69,3 +69,12 @@ test('Verify that user can see all the information removed when reloads the page await t.expect(await cliPage.cliCollapseButton.exists).notOk('CLI is collapsed'); await t.expect(await workbenchPage.queryInputScriptArea.textContent).eql('', 'Input in Editor is removed'); }); +test('Verify that user can see saved state of the Enablement area when navigates back to the Workbench from other page', async t => { + //Collapse the Enablement area and open Settings + await t.hover(workbenchPage.preselectArea); + await t.click(workbenchPage.collapsePreselectAreaButton); + await t.click(myRedisDatabasePage.settingsButton); + //Navigate back to Workbench and Verify the context + await t.click(myRedisDatabasePage.workbenchButton); + await t.expect(workbenchPage.enablementAreaTreeView.visible).notOk('The Enablement area is still collapsed'); +}); diff --git a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts index 1fc3c9f0b0..d73f4f5b07 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -72,3 +72,51 @@ test('Verify that user can see saved article in Enablement area when he leaves W //Check that user is on Workbench page and "Working with Hashes" page is displayed await t.expect(workbenchPage.preselectHashCreate.visible).ok('The end of the page is visible'); }); +//skipped due the issue RI-2384 +test.skip('Verify that user can see saved scroll position in Enablement area when he leaves Workbench page and goes back again', async t => { + //Open Working with Hashes section + await t.click(workbenchPage.internalLinkWorkingWithHashes); + //Evaluate the last button in Enablement Area + const buttonsQuantity = await workbenchPage.preselectButtons.count; + const lastButton = workbenchPage.preselectButtons.nth(buttonsQuantity - 1); + //Scroll to the very bottom of the page + await t.scrollIntoView(lastButton); + //Check the scroll position + const scrollPosition = await workbenchPage.scrolledEnablementArea.scrollTop; + //Go to Browser page + await t.click(myRedisDatabasePage.browserButton); + //Go back to Workbench page + await t.click(myRedisDatabasePage.workbenchButton); + //Check that scroll position is saved + await t.expect(workbenchPage.scrolledEnablementArea.scrollTop).eql(scrollPosition, 'The scroll position status'); + //Go to list of DBs page + await t.click(myRedisDatabasePage.myRedisDBButton); + //Go back to active DB again + await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); + //Check that scroll position is saved + await t.expect(workbenchPage.scrolledEnablementArea.scrollTop).eql(scrollPosition, 'Scroll position is correct'); +}); +test('Verify that user can see the siblings menu by clicking on page counter element between Back and Next buttons', async t => { + const popoverButtons = [ + 'Introduction', + 'Working with Hashes', + 'Working with JSON', + 'Learn More' + ] + //Open Working with Hashes section and click on the on page counter + await t.click(workbenchPage.internalLinkWorkingWithHashes); + await t.click(workbenchPage.enablementAreaPagination); + //Verify the siblings menu + await t.expect(workbenchPage.enablementAreaPaginationPopover.visible).ok('The siblings menu is displayed'); + const countOfButtons = await workbenchPage.paginationPopoverButtons.count; + for (let i = 0; i < countOfButtons; i++) { + const popoverButton = workbenchPage.paginationPopoverButtons.nth(i); + await t.expect(popoverButton.textContent).eql(popoverButtons[i], `The siblings menu button ${popoverButtons[i]} is displayed`); + } +}); +test('Verify that user can see the quick navigation section to navigate between siblings under the scrolling content', async t => { + //Open Working with Hashes section + await t.click(workbenchPage.internalLinkWorkingWithHashes); + //Verify the quick navigation section + await t.expect(workbenchPage.enablementAreaPagination.visible).ok('The quick navigation section is displayed'); +}); diff --git a/tests/e2e/tests/regression/workbench/history-of-results.e2e.ts b/tests/e2e/tests/regression/workbench/history-of-results.e2e.ts new file mode 100644 index 0000000000..97beb72a71 --- /dev/null +++ b/tests/e2e/tests/regression/workbench/history-of-results.e2e.ts @@ -0,0 +1,66 @@ +import { getRandomParagraph } from '../../../helpers/keys'; +import { acceptLicenseTermsAndAddDatabase } from '../../../helpers/database'; +import { MyRedisDatabasePage, WorkbenchPage, CliPage } from '../../../pageObjects'; +import { + commonUrl, + ossStandaloneConfig +} from '../../../helpers/conf'; + +const myRedisDatabasePage = new MyRedisDatabasePage(); +const workbenchPage = new WorkbenchPage(); +const cliPage = new CliPage(); + +const oneMinuteTimeout = 60000; +const command = 'set key test'; + +fixture `History of results at Workbench` + .meta({type: 'regression'}) + .page(commonUrl) + .beforeEach(async t => { + await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName); + //Go to Workbench page + await t.click(myRedisDatabasePage.workbenchButton); + }) + .afterEach(async(t) => { + //Clear database + await t.click(cliPage.cliExpandButton); + await t.typeText(cliPage.cliCommandInput, 'FLUSHDB'); + await t.pressKey('enter'); + await t.click(cliPage.cliCollapseButton); + }); +test('Verify that user can see original date and time of command execution in Workbench history after the page update', async t => { + //Send command and remember the time + await workbenchPage.sendCommandInWorkbench(command); + const dateTime = await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssCommandExecutionDateTime).textContent; + //Wait fo 1 minute, refresh page and check results + await t.wait(oneMinuteTimeout); + await t.eval(() => location.reload()); + await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssCommandExecutionDateTime).textContent).eql(dateTime, 'The original date and time of command execution is saved after the page update'); +}); +//skipped due the long time execution and hangs of test +test.skip('Verify that if command result is more than 1 MB and user refreshes the page, the message "Results have been deleted since they exceed 1 MB. Re-run the command to see new results." is displayed', async t => { + const commandToSend = 'set key'; + const commandToGet = 'get key'; + //Send command with value that exceed 1MB + let commandText = getRandomParagraph(10).repeat(100); + await workbenchPage.sendCommandInWorkbench(`${commandToSend} "${commandText}"`, 1, true); + await workbenchPage.sendCommandInWorkbench(commandToGet); + //Refresh the page and check result + await t.eval(() => location.reload()); + await t.click(workbenchPage.queryCardContainer.withText(commandToGet)); + await t.expect(workbenchPage.queryTextResult.textContent).eql('"Results have been deleted since they exceed 1 MB. Re-run the command to see new results."', 'The messageis displayed'); +}); +test('Verify that the first command in workbench history is deleted when user executes 31 command (new the following result replaces the first result)', async t => { + const numberOfCommands = 30; + const firstCommand = 'FT._LIST'; + //Send command the first command + await workbenchPage.sendCommandInWorkbench(firstCommand); + await t.expect(workbenchPage.queryCardContainer.nth(0).textContent).contains(firstCommand, 'The first executed command is in the workbench history'); + //Send 30 commands and check the results + await workbenchPage.sendCommandInWorkbench(`${numberOfCommands} ${command}`); + for( let i = 0; i < numberOfCommands; i++) { + await t.expect(workbenchPage.queryCardContainer.nth(0).textContent).contains(command, 'The command executed after the first command is displayed'); + await t.click(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssDeleteCommandButton)); + } + await t.expect(workbenchPage.noCommandHistoryTitle.visible).ok('The first command is deleted when user executes 31 command'); +}); diff --git a/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts b/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts index 34c8c9f689..e5f80895c4 100644 --- a/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts @@ -1,20 +1,12 @@ import { Selector } from 'testcafe'; -import { addNewStandaloneDatabase } from '../../../helpers/database'; -import { - MyRedisDatabasePage, - UserAgreementPage, - AddRedisDatabasePage, - WorkbenchPage, - CliPage -} from '../../../pageObjects'; +import { acceptLicenseTermsAndAddDatabase } from '../../../helpers/database'; +import { MyRedisDatabasePage, WorkbenchPage, CliPage } from '../../../pageObjects'; import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf'; const myRedisDatabasePage = new MyRedisDatabasePage(); -const userAgreementPage = new UserAgreementPage(); -const addRedisDatabasePage = new AddRedisDatabasePage(); const workbenchPage = new WorkbenchPage(); const cliPage = new CliPage(); @@ -24,12 +16,7 @@ fixture `Scripting area at Workbench` .meta({type: 'regression'}) .page(commonUrl) .beforeEach(async t => { - await t.maximizeWindow(); - await userAgreementPage.acceptLicenseTerms(); - await t.expect(addRedisDatabasePage.addDatabaseButton.exists).ok('The add redis database view', {timeout: 20000}); - await addNewStandaloneDatabase(ossStandaloneConfig); - //Connect to DB - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); + await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName); //Go to Workbench page await t.click(myRedisDatabasePage.workbenchButton); }) @@ -80,3 +67,29 @@ test('Verify that user can see an indication (green triangle) of commands from t //Compare number of indicator displayed and expected value await t.expect(workbenchPage.monacoCommandIndicator.count).eql(numberOfCommands, 'Number of command indicator'); }); +test('Verify that user can find (using right click) "Run Commands" custom shortcut option in monaco menu and run a command', async t => { + const command = 'HSET key field value'; + //Put a command in Editing Area + await t.typeText(workbenchPage.queryInput, command); + //Right click to get context menu + await t.rightClick(workbenchPage.queryInput); + //Select Command Palette option + await t.click(workbenchPage.monacoContextMenu.find(workbenchPage.cssMonacoCommandPaletteLine)); + //Print "Run Commands" shortcut + await t.typeText(workbenchPage.monacoShortcutInput, 'Run Commands'); + //Select "Run Commands" from menu + await t.click(workbenchPage.monacoSuggestionOption); + //Check the result with sent command + const commandTextInResult = await workbenchPage.queryCardCommand.withExactText(command); + await t.expect(commandTextInResult.exists).ok('The result of sent command'); +}); +test('Verify that user can repeat commands by entering a number of repeats before the Redis command and see separate results per each command in Workbench', async t => { + const command = 'FT._LIST'; + const repeats = 5; + //Rum command in Workbench with repeats + await workbenchPage.sendCommandInWorkbench(`${repeats} ${command}`); + //Verify result + for (let i = 0; i < repeats; i++) { + await t.expect(workbenchPage.queryCardContainer.nth(i).textContent).contains(command, `Workbench contains separate results`); + } +}); diff --git a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts index 92769495b6..e8a98162d8 100644 --- a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts +++ b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts @@ -14,6 +14,8 @@ const myRedisDatabasePage = new MyRedisDatabasePage(); const browserPage = new BrowserPage(); const userAgreementPage = new UserAgreementPage(); const addRedisDatabasePage = new AddRedisDatabasePage(); +const keyTTL = '2147476121'; +const expectedTTL = /214747612*/; fixture `Key details verification` .meta({ type: 'smoke' }) @@ -29,8 +31,6 @@ fixture `Key details verification` }) test('Verify that user can see Hash Key details', async t => { const keyName = 'Hash1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addHashKey(keyName, keyTTL); @@ -42,13 +42,11 @@ test('Verify that user can see Hash Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Hash', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Hash', 'The Key Badge'); }); test('Verify that user can see List Key details', async t => { const keyName = 'List1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addListKey(keyName, keyTTL); @@ -60,13 +58,11 @@ test('Verify that user can see List Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('List', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('List', 'The Key Badge'); }); test('Verify that user can see Set Key details', async t => { const keyName = 'Set1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addSetKey(keyName, keyTTL); @@ -78,12 +74,11 @@ test('Verify that user can see Set Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Set', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Set', 'The Key Badge'); }); test('Verify that user can see String Key details', async t => { const keyName = 'String1testKeyForEdit'; - const keyTTL = '2147476121'; const value = 'keyValue12334353434;' await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); @@ -97,13 +92,11 @@ test('Verify that user can see String Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('String', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('String', 'The Key Badge'); }); test('Verify that user can see ZSet Key details', async t => { const keyName = 'ZSet1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addZSetKey(keyName, '1', keyTTL); @@ -115,12 +108,11 @@ test('Verify that user can see ZSet Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Sorted Set', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Sorted Set', 'The Key Badge'); }); test('Verify that user can see JSON Key details', async t => { const keyName = 'JSON1testKeyForEdit'; - const keyTTL = '2147476121'; const jsonValue = '{"employee":{ "name":"John", "age":30, "city":"New York" }}'; await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); @@ -134,6 +126,6 @@ test('Verify that user can see JSON Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('JSON', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('JSON', 'The Key Badge'); }); diff --git a/tests/e2e/upload-custom-plugins.sh b/tests/e2e/upload-custom-plugins.sh new file mode 100755 index 0000000000..cc7d62e983 --- /dev/null +++ b/tests/e2e/upload-custom-plugins.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +curl --request GET -sL \ + --url 'https://s3.amazonaws.com/redisinsight.test/public/custom_plugins/plugins.zip'\ + --output './plugins.zip' + +echo "Custom plugins archive was downloaded" + +unzip -o plugins.zip -d ./plugins + +echo "Custom plugins were unarchived" + +exec "$@" diff --git a/tests/e2e/yarn.lock b/tests/e2e/yarn.lock index a82e3f0382..d80bc2eef2 100644 --- a/tests/e2e/yarn.lock +++ b/tests/e2e/yarn.lock @@ -1034,6 +1034,11 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" +"@types/chance@1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.1.3.tgz#d19fe9391288d60fdccd87632bfc9ab2b4523fea" + integrity sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw== + "@types/error-stack-parser@^1.3.18": version "1.3.18" resolved "https://registry.yarnpkg.com/@types/error-stack-parser/-/error-stack-parser-1.3.18.tgz#e01c9f8c85ca83b610320c62258b0c9026ade0f7" @@ -1603,6 +1608,11 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chance@1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz#5d6c2b78c9170bf6eb9df7acdda04363085be909" + integrity sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" diff --git a/yarn.lock b/yarn.lock index 1ed8c1fa1d..bc260efbf6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1645,6 +1645,11 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@socket.io/component-emitter@~3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9" + integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q== + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -2023,7 +2028,7 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0" integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ== -"@types/mdast@^3.0.0": +"@types/mdast@^3.0.0", "@types/mdast@^3.0.3": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== @@ -3399,6 +3404,11 @@ babel-preset-jest@^26.6.2: babel-plugin-jest-hoist "^26.6.2" babel-preset-current-node-syntax "^1.0.0" +backo2@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + bail@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" @@ -3414,6 +3424,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +base64-arraybuffer@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz#87bd13525626db4a9838e00a508c2b73efcf348c" + integrity sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA== + base64-js@^1.0.2, base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -4450,7 +4465,7 @@ compare-versions@^3.6.0: resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== -component-emitter@^1.2.0, component-emitter@^1.2.1: +component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -5014,7 +5029,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -5747,6 +5762,28 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +engine.io-client@~6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.1.1.tgz#800d4b9db5487d169686729e5bd887afa78d36b0" + integrity sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g== + dependencies: + "@socket.io/component-emitter" "~3.0.0" + debug "~4.3.1" + engine.io-parser "~5.0.0" + has-cors "1.1.0" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~8.2.3" + xmlhttprequest-ssl "~2.0.0" + yeast "0.1.2" + +engine.io-parser@~5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.2.tgz#69a2ec3ed431da021f0666712d07f106bcffa6ce" + integrity sha512-wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g== + dependencies: + base64-arraybuffer "~1.0.1" + enhanced-resolve@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" @@ -5896,6 +5933,11 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escape-string-regexp@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" + integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -7190,6 +7232,11 @@ has-bigints@^1.0.1: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== +has-cors@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -9447,6 +9494,11 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== +longest-streak@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.1.tgz#c97315b7afa0e7d9525db9a5a2953651432bdc5d" + integrity sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg== + loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -9562,6 +9614,11 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== +markdown-table@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c" + integrity sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -9594,6 +9651,15 @@ mdast-util-definitions@^5.0.0: "@types/unist" "^2.0.0" unist-util-visit "^3.0.0" +mdast-util-find-and-replace@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.1.0.tgz#69728acd250749f8aac6e150e07d1fd15619e829" + integrity sha512-1w1jbqAd13oU78QPBf5223+xB+37ecNtQ1JElq2feWols5oEYAl+SgNDnOZipe7NfLemoEt362yUS15/wip4mw== + dependencies: + escape-string-regexp "^5.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^4.0.0" + mdast-util-from-markdown@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268" @@ -9612,6 +9678,61 @@ mdast-util-from-markdown@^1.0.0: unist-util-stringify-position "^3.0.0" uvu "^0.5.0" +mdast-util-gfm-autolink-literal@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz#4032dcbaddaef7d4f2f3768ed830475bb22d3970" + integrity sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg== + dependencies: + "@types/mdast" "^3.0.0" + ccount "^2.0.0" + mdast-util-find-and-replace "^2.0.0" + micromark-util-character "^1.0.0" + +mdast-util-gfm-footnote@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.0.tgz#355c1e8dc9e17e871d1b3fa5da8824923fc756e0" + integrity sha512-qeg9YoS2YYP6OBmMyUFxKXb6BLwAsbGidIxgwDAXHIMYZQhIwe52L9BSJs+zP29Jp5nSERPkmG3tSwAN23/ZbQ== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-to-markdown "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + unist-util-visit "^4.0.0" + +mdast-util-gfm-strikethrough@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.0.tgz#6cc72ef5d9539f4cee76af3f15dd0daa9e3af40f" + integrity sha512-gM9ipBUdRxYa6Yq1Hd8Otg6jEn/dRxFZ1F9ZX4QHosHOexLGqNZO2dh0A+YFbUEd10RcKjnjb4jOfJJzoXXUew== + dependencies: + "@types/mdast" "^3.0.3" + mdast-util-to-markdown "^1.0.0" + +mdast-util-gfm-table@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.2.tgz#c727c20d5ac0d7d4b238d50b48e2924f0b77cc76" + integrity sha512-pPekvCTChFBF8uCq8bVyQwar8NBU/TaXIy44jj/UzmjMgPBHIa1B1ge8a0JVgzhqgXQAMvGT+PgiKlicdLGfDQ== + dependencies: + markdown-table "^3.0.0" + mdast-util-to-markdown "^1.0.0" + +mdast-util-gfm-task-list-item@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.0.tgz#a0aa2a00c893f9f006d13ba096cbc64608559c7f" + integrity sha512-dwkzOTjQe8JCCHVE3Cb0pLHTYLudf7t9WCAnb20jI8/dW+VHjgWhjtIUVA3oigNkssgjEwX+i+3XesUdCnXGyA== + dependencies: + "@types/mdast" "^3.0.3" + mdast-util-to-markdown "^1.0.0" + +mdast-util-gfm@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-2.0.0.tgz#2545856bc18a66d5cc63fbef0b097a020a8e9e3d" + integrity sha512-wMwejlTN3EQADPFuvxe8lmGsay3+f6gSJKdAHR6KBJzpcxvsjJSILB9K6u6G7eQLC7iOTyVIHYGui9uBc9r1Tg== + dependencies: + mdast-util-gfm-autolink-literal "^1.0.0" + mdast-util-gfm-footnote "^1.0.0" + mdast-util-gfm-strikethrough "^1.0.0" + mdast-util-gfm-table "^1.0.0" + mdast-util-gfm-task-list-item "^1.0.0" + mdast-util-to-hast@^10.0.0, mdast-util-to-hast@^10.2.0: version "10.2.0" resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604" @@ -9642,7 +9763,20 @@ mdast-util-to-hast@^12.1.0: unist-util-position "^4.0.0" unist-util-visit "^4.0.0" -mdast-util-to-string@^3.1.0: +mdast-util-to-markdown@^1.0.0: + version "1.2.6" + resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.6.tgz#9d0d1fcb22838e4af83fb04841cbde92525972f3" + integrity sha512-doJZmTEGagHypWvJ8ltinmwUsT9ZaNgNIQW6Gl7jNdsI1QZkTHTimYW561Niy2s8AEPAqEgV0dIh2UOVlSXUJA== + dependencies: + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + longest-streak "^3.0.0" + mdast-util-to-string "^3.0.0" + micromark-util-decode-string "^1.0.0" + unist-util-visit "^4.0.0" + zwitch "^2.0.0" + +mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== @@ -9736,7 +9870,7 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromark-core-commonmark@^1.0.1: +micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad" integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA== @@ -9758,6 +9892,85 @@ micromark-core-commonmark@^1.0.1: micromark-util-types "^1.0.1" uvu "^0.5.0" +micromark-extension-gfm-autolink-literal@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz#dc589f9c37eaff31a175bab49f12290edcf96058" + integrity sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-sanitize-uri "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-extension-gfm-footnote@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.3.tgz#5280b29667e4ecb8687f369829aa3322caca7d11" + integrity sha512-bn62pC5y39rIo2g1RqZk1NhF7T7cJLuJlbevunQz41U0iPVCdVOFASe5/L1kke+DFKSgfCRhv24+o42cZ1+ADw== + dependencies: + micromark-core-commonmark "^1.0.0" + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-sanitize-uri "^1.0.0" + micromark-util-symbol "^1.0.0" + uvu "^0.5.0" + +micromark-extension-gfm-strikethrough@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz#162232c284ffbedd8c74e59c1525bda217295e18" + integrity sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ== + dependencies: + micromark-util-chunked "^1.0.0" + micromark-util-classify-character "^1.0.0" + micromark-util-resolve-all "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-extension-gfm-table@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz#7b708b728f8dc4d95d486b9e7a2262f9cddbcbb4" + integrity sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-extension-gfm-tagfilter@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz#fb2e303f7daf616db428bb6a26e18fda14a90a4d" + integrity sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA== + dependencies: + micromark-util-types "^1.0.0" + +micromark-extension-gfm-task-list-item@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz#7683641df5d4a09795f353574d7f7f66e47b7fc4" + integrity sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-extension-gfm@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz#40f3209216127a96297c54c67f5edc7ef2d1a2a2" + integrity sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA== + dependencies: + micromark-extension-gfm-autolink-literal "^1.0.0" + micromark-extension-gfm-footnote "^1.0.0" + micromark-extension-gfm-strikethrough "^1.0.0" + micromark-extension-gfm-table "^1.0.0" + micromark-extension-gfm-tagfilter "^1.0.0" + micromark-extension-gfm-task-list-item "^1.0.0" + micromark-util-combine-extensions "^1.0.0" + micromark-util-types "^1.0.0" + micromark-factory-destination@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e" @@ -10971,6 +11184,16 @@ parse5@6.0.1, parse5@^6.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parseqs@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" + integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== + +parseuri@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" + integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -12392,6 +12615,16 @@ remark-emoji@^2.1.0: node-emoji "^1.10.0" unist-util-visit "^2.0.3" +remark-gfm@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-3.0.1.tgz#0b180f095e3036545e9dddac0e8df3fa5cfee54f" + integrity sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-gfm "^2.0.0" + micromark-extension-gfm "^2.0.0" + unified "^10.0.0" + remark-parse@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz#6f60ae53edbf0cf38ea223fe643db64d112e0775" @@ -13152,6 +13385,33 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +socket.io-client@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.4.0.tgz#d6568ebd79ac12e2d6b628e7e90e60f1d48d99ff" + integrity sha512-g7riSEJXi7qCFImPow98oT8X++MSsHz6MMFRXkWNJ6uEROSHOa3kxdrsYWMq85dO+09CFMkcqlpjvbVXQl4z6g== + dependencies: + "@socket.io/component-emitter" "~3.0.0" + backo2 "~1.0.2" + debug "~4.3.2" + engine.io-client "~6.1.1" + parseuri "0.0.6" + socket.io-parser "~4.1.1" + +socket.io-mock@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/socket.io-mock/-/socket.io-mock-1.3.2.tgz#3f6f56f9bc2a2852783bd8aae85159def5cd1942" + integrity sha512-p4MQBue3NAR8bXIHynRJxK/C+J3I3NpnnpgjptgLFSWv4u9Bdkubf2t0GCmyLmUTi03up0Cx/hQwzQfOpD187g== + dependencies: + component-emitter "^1.3.0" + +socket.io-parser@~4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.1.tgz#0ad53d980781cab1eabe320417d8480c0133e62d" + integrity sha512-USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA== + dependencies: + "@socket.io/component-emitter" "~3.0.0" + debug "~4.3.1" + sockjs-client@^1.5.0: version "1.5.2" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3" @@ -15203,6 +15463,11 @@ ws@^7.3.1, ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== +ws@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" @@ -15228,6 +15493,11 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xmlhttprequest-ssl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== + xtend@^4.0.0, xtend@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -15360,6 +15630,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" @@ -15374,3 +15649,8 @@ zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== + +zwitch@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1" + integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==