From b2a7471be071ca6df470ac9a63667217e33b1126 Mon Sep 17 00:00:00 2001 From: Lukas Olson Date: Tue, 5 Nov 2024 15:40:13 -0700 Subject: [PATCH] Remove bfetch plugin --- .github/CODEOWNERS | 2 - .i18nrc.json | 1 - api_docs/kbn_bfetch_error.devdocs.json | 101 --- api_docs/kbn_bfetch_error.mdx | 30 - docs/management/advanced-options.asciidoc | 6 - examples/bfetch_explorer/README.md | 11 - examples/bfetch_explorer/kibana.jsonc | 17 - .../public/components/count_until/index.tsx | 83 -- .../components/double_integers/index.tsx | 95 --- .../public/components/page/index.tsx | 34 - .../public/containers/app/index.tsx | 37 - .../app/pages/page_count_until/index.tsx | 33 - .../app/pages/page_double_integers/index.tsx | 33 - .../public/containers/app/sidebar/index.tsx | 42 - .../bfetch_explorer/public/hooks/use_deps.ts | 13 - examples/bfetch_explorer/public/index.ts | 12 - examples/bfetch_explorer/public/mount.tsx | 39 - examples/bfetch_explorer/public/plugin.tsx | 67 -- examples/bfetch_explorer/public/routes.tsx | 49 -- examples/bfetch_explorer/server/index.ts | 13 - examples/bfetch_explorer/server/plugin.ts | 58 -- examples/bfetch_explorer/tsconfig.json | 24 - package.json | 3 - packages/kbn-bfetch-error/BUILD.bazel | 35 - packages/kbn-bfetch-error/README.md | 3 - packages/kbn-bfetch-error/index.ts | 10 - packages/kbn-bfetch-error/jest.config.js | 14 - packages/kbn-bfetch-error/kibana.jsonc | 5 - packages/kbn-bfetch-error/package.json | 6 - packages/kbn-bfetch-error/src/bfetch_error.ts | 38 - packages/kbn-bfetch-error/tsconfig.json | 21 - .../settings/setting_ids/index.ts | 2 - packages/kbn-optimizer/limits.yml | 1 - packages/kbn-search-errors/BUILD.bazel | 1 - .../src/render_search_error.ts | 3 +- packages/kbn-search-errors/tsconfig.json | 1 - src/plugins/bfetch/README.md | 56 -- src/plugins/bfetch/common/batch.ts | 27 - .../buffer/create_batched_function.test.ts | 65 -- .../common/buffer/create_batched_function.ts | 39 - src/plugins/bfetch/common/buffer/index.ts | 10 - src/plugins/bfetch/common/constants.ts | 12 - src/plugins/bfetch/common/index.ts | 18 - src/plugins/bfetch/common/streaming/index.ts | 10 - src/plugins/bfetch/common/streaming/types.ts | 14 - src/plugins/bfetch/common/types.ts | 10 - src/plugins/bfetch/common/util/index.ts | 12 - .../bfetch/common/util/normalize_error.ts | 36 - .../bfetch/common/util/query_params.ts | 13 - .../common/util/remove_leading_slash.ts | 10 - src/plugins/bfetch/docs/browser/reference.md | 44 - src/plugins/bfetch/docs/server/reference.md | 54 -- src/plugins/bfetch/jest.config.js | 17 - src/plugins/bfetch/kibana.jsonc | 18 - .../create_streaming_batched_function.test.ts | 756 ------------------ .../create_streaming_batched_function.ts | 170 ---- src/plugins/bfetch/public/batching/index.ts | 11 - src/plugins/bfetch/public/batching/types.ts | 21 - src/plugins/bfetch/public/index.ts | 22 - src/plugins/bfetch/public/mocks.ts | 55 -- src/plugins/bfetch/public/plugin.ts | 116 --- .../public/streaming/fetch_streaming.test.ts | 362 --------- .../public/streaming/fetch_streaming.ts | 68 -- .../streaming/from_streaming_xhr.test.ts | 271 ------- .../public/streaming/from_streaming_xhr.ts | 74 -- src/plugins/bfetch/public/streaming/index.ts | 13 - .../public/streaming/inflate_response.ts | 17 - .../bfetch/public/streaming/split.test.ts | 61 -- src/plugins/bfetch/public/streaming/split.ts | 49 -- src/plugins/bfetch/public/test_helpers/xhr.ts | 69 -- src/plugins/bfetch/server/index.ts | 17 - src/plugins/bfetch/server/mocks.ts | 52 -- src/plugins/bfetch/server/plugin.ts | 221 ----- .../streaming/create_compressed_stream.ts | 109 --- .../server/streaming/create_ndjson_stream.ts | 40 - .../bfetch/server/streaming/create_stream.ts | 25 - src/plugins/bfetch/server/streaming/index.ts | 12 - src/plugins/bfetch/server/ui_settings.ts | 56 -- src/plugins/bfetch/tsconfig.json | 21 - src/plugins/data/kibana.jsonc | 3 +- src/plugins/data/public/plugin.ts | 2 - .../data/public/search/search_service.test.ts | 5 - .../data/public/search/search_service.ts | 11 +- src/plugins/data/public/types.ts | 2 - src/plugins/data/server/plugin.ts | 3 - .../data/server/search/search_service.test.ts | 4 - .../data/server/search/search_service.ts | 4 +- src/plugins/data/tsconfig.json | 1 - .../server/collectors/management/schema.ts | 8 - .../server/collectors/management/types.ts | 2 - .../bfetch_explorer/batched_function.ts | 82 -- test/examples/bfetch_explorer/index.ts | 25 - .../ccs_compatibility/_timeout_results.ts | 119 +-- .../apps/discover/group3/_request_counts.ts | 3 +- .../test_suites/run_pipeline/index.ts | 1 - test/tsconfig.json | 1 - tsconfig.base.json | 6 - .../synthetics/kibana.jsonc | 3 +- .../synthetics/server/types.ts | 2 - .../synthetics/tsconfig.json | 1 - .../uptime/kibana.jsonc | 3 +- .../lib/adapters/framework/adapter_types.ts | 2 - .../uptime/tsconfig.json | 1 - .../translations/translations/fr-FR.json | 4 - .../translations/translations/ja-JP.json | 4 - .../translations/translations/zh-CN.json | 4 - .../test/api_integration/apis/maps/bsearch.ts | 113 --- .../search_examples/search_example.ts | 114 ++- x-pack/test/tsconfig.json | 1 - yarn.lock | 12 - 110 files changed, 81 insertions(+), 4561 deletions(-) delete mode 100644 api_docs/kbn_bfetch_error.devdocs.json delete mode 100644 api_docs/kbn_bfetch_error.mdx delete mode 100644 examples/bfetch_explorer/README.md delete mode 100644 examples/bfetch_explorer/kibana.jsonc delete mode 100644 examples/bfetch_explorer/public/components/count_until/index.tsx delete mode 100644 examples/bfetch_explorer/public/components/double_integers/index.tsx delete mode 100644 examples/bfetch_explorer/public/components/page/index.tsx delete mode 100644 examples/bfetch_explorer/public/containers/app/index.tsx delete mode 100644 examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx delete mode 100644 examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx delete mode 100644 examples/bfetch_explorer/public/containers/app/sidebar/index.tsx delete mode 100644 examples/bfetch_explorer/public/hooks/use_deps.ts delete mode 100644 examples/bfetch_explorer/public/index.ts delete mode 100644 examples/bfetch_explorer/public/mount.tsx delete mode 100644 examples/bfetch_explorer/public/plugin.tsx delete mode 100644 examples/bfetch_explorer/public/routes.tsx delete mode 100644 examples/bfetch_explorer/server/index.ts delete mode 100644 examples/bfetch_explorer/server/plugin.ts delete mode 100644 examples/bfetch_explorer/tsconfig.json delete mode 100644 packages/kbn-bfetch-error/BUILD.bazel delete mode 100644 packages/kbn-bfetch-error/README.md delete mode 100644 packages/kbn-bfetch-error/index.ts delete mode 100644 packages/kbn-bfetch-error/jest.config.js delete mode 100644 packages/kbn-bfetch-error/kibana.jsonc delete mode 100644 packages/kbn-bfetch-error/package.json delete mode 100644 packages/kbn-bfetch-error/src/bfetch_error.ts delete mode 100644 packages/kbn-bfetch-error/tsconfig.json delete mode 100644 src/plugins/bfetch/README.md delete mode 100644 src/plugins/bfetch/common/batch.ts delete mode 100644 src/plugins/bfetch/common/buffer/create_batched_function.test.ts delete mode 100644 src/plugins/bfetch/common/buffer/create_batched_function.ts delete mode 100644 src/plugins/bfetch/common/buffer/index.ts delete mode 100644 src/plugins/bfetch/common/constants.ts delete mode 100644 src/plugins/bfetch/common/index.ts delete mode 100644 src/plugins/bfetch/common/streaming/index.ts delete mode 100644 src/plugins/bfetch/common/streaming/types.ts delete mode 100644 src/plugins/bfetch/common/types.ts delete mode 100644 src/plugins/bfetch/common/util/index.ts delete mode 100644 src/plugins/bfetch/common/util/normalize_error.ts delete mode 100644 src/plugins/bfetch/common/util/query_params.ts delete mode 100644 src/plugins/bfetch/common/util/remove_leading_slash.ts delete mode 100644 src/plugins/bfetch/docs/browser/reference.md delete mode 100644 src/plugins/bfetch/docs/server/reference.md delete mode 100644 src/plugins/bfetch/jest.config.js delete mode 100644 src/plugins/bfetch/kibana.jsonc delete mode 100644 src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts delete mode 100644 src/plugins/bfetch/public/batching/create_streaming_batched_function.ts delete mode 100644 src/plugins/bfetch/public/batching/index.ts delete mode 100644 src/plugins/bfetch/public/batching/types.ts delete mode 100644 src/plugins/bfetch/public/index.ts delete mode 100644 src/plugins/bfetch/public/mocks.ts delete mode 100644 src/plugins/bfetch/public/plugin.ts delete mode 100644 src/plugins/bfetch/public/streaming/fetch_streaming.test.ts delete mode 100644 src/plugins/bfetch/public/streaming/fetch_streaming.ts delete mode 100644 src/plugins/bfetch/public/streaming/from_streaming_xhr.test.ts delete mode 100644 src/plugins/bfetch/public/streaming/from_streaming_xhr.ts delete mode 100644 src/plugins/bfetch/public/streaming/index.ts delete mode 100644 src/plugins/bfetch/public/streaming/inflate_response.ts delete mode 100644 src/plugins/bfetch/public/streaming/split.test.ts delete mode 100644 src/plugins/bfetch/public/streaming/split.ts delete mode 100644 src/plugins/bfetch/public/test_helpers/xhr.ts delete mode 100644 src/plugins/bfetch/server/index.ts delete mode 100644 src/plugins/bfetch/server/mocks.ts delete mode 100644 src/plugins/bfetch/server/plugin.ts delete mode 100644 src/plugins/bfetch/server/streaming/create_compressed_stream.ts delete mode 100644 src/plugins/bfetch/server/streaming/create_ndjson_stream.ts delete mode 100644 src/plugins/bfetch/server/streaming/create_stream.ts delete mode 100644 src/plugins/bfetch/server/streaming/index.ts delete mode 100644 src/plugins/bfetch/server/ui_settings.ts delete mode 100644 src/plugins/bfetch/tsconfig.json delete mode 100644 test/examples/bfetch_explorer/batched_function.ts delete mode 100644 test/examples/bfetch_explorer/index.ts delete mode 100644 x-pack/test/api_integration/apis/maps/bsearch.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 43a315646772d..788592ec56b1b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -59,9 +59,7 @@ packages/kbn-babel-register @elastic/kibana-operations packages/kbn-babel-transform @elastic/kibana-operations x-pack/plugins/banners @elastic/appex-sharedux packages/kbn-bazel-runner @elastic/kibana-operations -packages/kbn-bfetch-error @elastic/appex-sharedux examples/bfetch_explorer @elastic/appex-sharedux -src/plugins/bfetch @elastic/appex-sharedux packages/kbn-calculate-auto @elastic/obs-ux-management-team packages/kbn-calculate-width-from-char-count @elastic/kibana-visualizations x-pack/plugins/canvas @elastic/kibana-presentation diff --git a/.i18nrc.json b/.i18nrc.json index 5c7642e6283eb..189fd256ad90d 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -9,7 +9,6 @@ "autocomplete": "packages/kbn-securitysolution-autocomplete/src", "avcBanner": "packages/kbn-avc-banner/src", "bfetch": "src/plugins/bfetch", - "bfetchError": "packages/kbn-bfetch-error", "cases": ["packages/kbn-cases-components"], "cellActions": "packages/kbn-cell-actions", "charts": "src/plugins/charts", diff --git a/api_docs/kbn_bfetch_error.devdocs.json b/api_docs/kbn_bfetch_error.devdocs.json deleted file mode 100644 index 425adaaaf5275..0000000000000 --- a/api_docs/kbn_bfetch_error.devdocs.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "id": "@kbn/bfetch-error", - "client": { - "classes": [], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [], - "objects": [] - }, - "server": { - "classes": [], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [], - "objects": [] - }, - "common": { - "classes": [ - { - "parentPluginId": "@kbn/bfetch-error", - "id": "def-common.BfetchRequestError", - "type": "Class", - "tags": [], - "label": "BfetchRequestError", - "description": [ - "\nError thrown when xhr request fails" - ], - "signature": [ - { - "pluginId": "@kbn/bfetch-error", - "scope": "common", - "docId": "kibKbnBfetchErrorPluginApi", - "section": "def-common.BfetchRequestError", - "text": "BfetchRequestError" - }, - " extends Error" - ], - "path": "packages/kbn-bfetch-error/src/bfetch_error.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "@kbn/bfetch-error", - "id": "def-common.BfetchRequestError.Unnamed", - "type": "Function", - "tags": [], - "label": "Constructor", - "description": [ - "\nconstructor" - ], - "signature": [ - "any" - ], - "path": "packages/kbn-bfetch-error/src/bfetch_error.ts", - "deprecated": false, - "trackAdoption": false, - "children": [ - { - "parentPluginId": "@kbn/bfetch-error", - "id": "def-common.BfetchRequestError.Unnamed.$1", - "type": "number", - "tags": [], - "label": "code", - "description": [ - "- Xhr error code" - ], - "signature": [ - "number" - ], - "path": "packages/kbn-bfetch-error/src/bfetch_error.ts", - "deprecated": false, - "trackAdoption": false, - "isRequired": true - } - ], - "returnComment": [] - }, - { - "parentPluginId": "@kbn/bfetch-error", - "id": "def-common.BfetchRequestError.code", - "type": "number", - "tags": [], - "label": "code", - "description": [], - "path": "packages/kbn-bfetch-error/src/bfetch_error.ts", - "deprecated": false, - "trackAdoption": false - } - ], - "initialIsOpen": false - } - ], - "functions": [], - "interfaces": [], - "enums": [], - "misc": [], - "objects": [] - } -} \ No newline at end of file diff --git a/api_docs/kbn_bfetch_error.mdx b/api_docs/kbn_bfetch_error.mdx deleted file mode 100644 index 8c91cf2492cda..0000000000000 --- a/api_docs/kbn_bfetch_error.mdx +++ /dev/null @@ -1,30 +0,0 @@ ---- -#### -#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system. -#### Reach out in #docs-engineering for more info. -#### -id: kibKbnBfetchErrorPluginApi -slug: /kibana-dev-docs/api/kbn-bfetch-error -title: "@kbn/bfetch-error" -image: https://source.unsplash.com/400x175/?github -description: API docs for the @kbn/bfetch-error plugin -date: 2024-11-05 -tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/bfetch-error'] ---- -import kbnBfetchErrorObj from './kbn_bfetch_error.devdocs.json'; - - - -Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin. - -**Code health stats** - -| Public API count | Any count | Items lacking comments | Missing exports | -|-------------------|-----------|------------------------|-----------------| -| 4 | 0 | 1 | 0 | - -## Common - -### Classes - - diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc index d6ae2aecaf276..2aff3774b9d9c 100644 --- a/docs/management/advanced-options.asciidoc +++ b/docs/management/advanced-options.asciidoc @@ -43,12 +43,6 @@ Change the settings that apply only to {kib} spaces. [[auto-complete-use-time-tange]]`autocomplete:useTimeRange`:: When disabled, autocompletes the suggestions from your data set instead of the time range. -[[bfetch-disable]]`bfetch:disable`:: -deprecated:[8.15.0] When disabled, search requests from Kibana will be made in individual HTTP requests rather than bundled together. - -[[bfetch-disable-compression]]`bfetch:disableCompression`:: -deprecated:[8.15.0] When disabled, allows you to debug individual requests, but increases the response size. - [[csv-quotevalues]]`csv:quoteValues`:: Set this property to `true` to quote exported values. diff --git a/examples/bfetch_explorer/README.md b/examples/bfetch_explorer/README.md deleted file mode 100644 index 33723e7cabe07..0000000000000 --- a/examples/bfetch_explorer/README.md +++ /dev/null @@ -1,11 +0,0 @@ -## bfetch explorer - -bfetch is a service that allows you to batch HTTP requests and stream responses -back. - -This example app demonstrates: - - How you can create a streaming response route and consume it from the - client - - How you can create a batch processing route and consume it from the client - -To run this example, use the command `yarn start --run-examples`. diff --git a/examples/bfetch_explorer/kibana.jsonc b/examples/bfetch_explorer/kibana.jsonc deleted file mode 100644 index dbcd5c3496355..0000000000000 --- a/examples/bfetch_explorer/kibana.jsonc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "plugin", - "id": "@kbn/bfetch-explorer-plugin", - "owner": "@elastic/appex-sharedux", - "plugin": { - "id": "bfetchExplorer", - "server": true, - "browser": true, - "requiredPlugins": [ - "bfetch", - "developerExamples" - ], - "requiredBundles": [ - "kibanaReact" - ] - } -} diff --git a/examples/bfetch_explorer/public/components/count_until/index.tsx b/examples/bfetch_explorer/public/components/count_until/index.tsx deleted file mode 100644 index 3708fcc78193e..0000000000000 --- a/examples/bfetch_explorer/public/components/count_until/index.tsx +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React, { useState } from 'react'; -import useMountedState from 'react-use/lib/useMountedState'; -import useList from 'react-use/lib/useList'; -import { EuiForm, EuiSpacer, EuiFieldNumber, EuiFormRow, EuiButton } from '@elastic/eui'; -import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public'; - -export interface Props { - fetchStreaming: BfetchPublicSetup['fetchStreaming']; -} - -export const CountUntil: React.FC = ({ fetchStreaming }) => { - const isMounted = useMountedState(); - const [data, setData] = useState(5); - const [showingResults, setShowingResults] = useState(false); - const [results, { push: pushResult, clear: clearList }] = useList([]); - const [completed, setCompleted] = useState(false); - const [error, setError] = useState(null); - - const handleSubmit = () => { - setShowingResults(true); - const { stream } = fetchStreaming({ - url: '/bfetch_explorer/count', - body: JSON.stringify({ data }), - }); - stream.subscribe({ - next: (next: string) => { - if (!isMounted()) return; - pushResult(next); - }, - error: (nextError: any) => { - if (!isMounted()) return; - setError(nextError); - }, - complete: () => { - if (!isMounted()) return; - setCompleted(true); - }, - }); - }; - - const handleReset = () => { - setShowingResults(false); - clearList(); - setError(null); - setCompleted(false); - }; - - if (showingResults) { - return ( - - 
{JSON.stringify(error || results, null, 4)}
- - - Reset - - - ); - } - - return ( - - - setData(Number(e.target.value))} - /> - - - Start - - - ); -}; diff --git a/examples/bfetch_explorer/public/components/double_integers/index.tsx b/examples/bfetch_explorer/public/components/double_integers/index.tsx deleted file mode 100644 index cf71bde62f09e..0000000000000 --- a/examples/bfetch_explorer/public/components/double_integers/index.tsx +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React, { useState } from 'react'; -import useMountedState from 'react-use/lib/useMountedState'; -import useList from 'react-use/lib/useList'; -import useCounter from 'react-use/lib/useCounter'; -import { EuiForm, EuiSpacer, EuiTextArea, EuiFormRow, EuiButton } from '@elastic/eui'; -import { ExplorerService } from '../../plugin'; - -interface ResultItem { - num: number; - result?: { - num: number; - }; - error?: any; -} - -const defaultNumbers = [2000, 300, -1, 1000].join('\n'); - -export interface Props { - double: ExplorerService['double']; -} - -export const DoubleIntegers: React.FC = ({ double }) => { - const isMounted = useMountedState(); - const [numbers, setNumbers] = useState(defaultNumbers); - const [showingResults, setShowingResults] = useState(false); - const [numberOfResultsAwaiting, counter] = useCounter(0); - const [results, { push: pushResult, clear: clearList }] = useList([]); - - const handleSubmit = () => { - setShowingResults(true); - const nums = numbers - .split('\n') - .map((num) => num.trim()) - .filter(Boolean) - .map(Number); - counter.set(nums.length); - nums.forEach((num) => { - double({ num }).then( - (result) => { - if (!isMounted()) return; - counter.dec(); - pushResult({ num, result }); - }, - (error) => { - if (!isMounted()) return; - counter.dec(); - pushResult({ num, error }); - } - ); - }); - }; - - const handleReset = () => { - setShowingResults(false); - counter.reset(); - clearList(); - }; - - if (showingResults) { - return ( - - 
{JSON.stringify(results, null, 4)}
- - - Reset - - - ); - } - - return ( - - - setNumbers(e.target.value)} - /> - - - Send - - - ); -}; diff --git a/examples/bfetch_explorer/public/components/page/index.tsx b/examples/bfetch_explorer/public/components/page/index.tsx deleted file mode 100644 index 2d17f9ba23dae..0000000000000 --- a/examples/bfetch_explorer/public/components/page/index.tsx +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React, { FC, PropsWithChildren } from 'react'; -import { EuiPageTemplate, EuiPageSection, EuiPageHeader } from '@elastic/eui'; - -export interface PageProps { - title?: React.ReactNode; - sidebar?: React.ReactNode; -} - -export const Page: FC> = ({ - title = 'Untitled', - sidebar, - children, -}) => { - return ( - - {sidebar} - - - - - {children} - - - ); -}; diff --git a/examples/bfetch_explorer/public/containers/app/index.tsx b/examples/bfetch_explorer/public/containers/app/index.tsx deleted file mode 100644 index 9ddd1b44e4354..0000000000000 --- a/examples/bfetch_explorer/public/containers/app/index.tsx +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React from 'react'; -import { Redirect } from 'react-router-dom'; -import { BrowserRouter as Router, Route, Routes } from '@kbn/shared-ux-router'; -import { EuiPage } from '@elastic/eui'; -import { useDeps } from '../../hooks/use_deps'; -import { routes } from '../../routes'; - -export const App: React.FC = () => { - const { appBasePath } = useDeps(); - - const routeElements: React.ReactElement[] = []; - for (const { items } of routes) { - for (const { id, component } of items) { - routeElements.push( component} />); - } - } - - return ( - - - - {routeElements} - - - - - ); -}; diff --git a/examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx b/examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx deleted file mode 100644 index fdd5de83bf058..0000000000000 --- a/examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import * as React from 'react'; -import { EuiPanel, EuiText } from '@elastic/eui'; -import { CountUntil } from '../../../../components/count_until'; -import { Page } from '../../../../components/page'; -import { useDeps } from '../../../../hooks/use_deps'; -import { Sidebar } from '../../sidebar'; - -export const PageCountUntil = () => { - const { plugins } = useDeps(); - - return ( - }> - - This demo sends a single number N using fetchStreaming to the server. The - server will stream back N number of messages with 1 second delay each containing a number - from 1 to N, after which it will close the stream. - -
- - - - - ); -}; diff --git a/examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx b/examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx deleted file mode 100644 index 4e6b1864c638d..0000000000000 --- a/examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import * as React from 'react'; -import { EuiPanel, EuiText } from '@elastic/eui'; -import { DoubleIntegers } from '../../../../components/double_integers'; -import { Page } from '../../../../components/page'; -import { useDeps } from '../../../../hooks/use_deps'; -import { Sidebar } from '../../sidebar'; - -export const PageDoubleIntegers = () => { - const { explorer } = useDeps(); - - return ( - }> - - Below is a list of numbers in milliseconds. They are sent as a batch to the server. For each - number server waits given number of milliseconds then doubles the number and streams it - back. - -
- - - - - ); -}; diff --git a/examples/bfetch_explorer/public/containers/app/sidebar/index.tsx b/examples/bfetch_explorer/public/containers/app/sidebar/index.tsx deleted file mode 100644 index 784c8b5a7b1fa..0000000000000 --- a/examples/bfetch_explorer/public/containers/app/sidebar/index.tsx +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React from 'react'; -import { EuiSideNav } from '@elastic/eui'; -import { useHistory } from 'react-router-dom'; -import { routes } from '../../../routes'; - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -interface SidebarProps {} - -export const Sidebar: React.FC = () => { - const history = useHistory(); - - return ( - ({ - id, - name: title, - isSelected: true, - items: items.map((route) => ({ - id: route.id, - name: route.title, - onClick: () => history.push(`/${route.id}`), - 'data-test-subj': route.id, - })), - })), - }, - ]} - /> - ); -}; diff --git a/examples/bfetch_explorer/public/hooks/use_deps.ts b/examples/bfetch_explorer/public/hooks/use_deps.ts deleted file mode 100644 index a212525d00eff..0000000000000 --- a/examples/bfetch_explorer/public/hooks/use_deps.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { useKibana } from '@kbn/kibana-react-plugin/public'; -import { BfetchDeps } from '../mount'; - -export const useDeps = () => useKibana().services as unknown as BfetchDeps; diff --git a/examples/bfetch_explorer/public/index.ts b/examples/bfetch_explorer/public/index.ts deleted file mode 100644 index ebc736cca673b..0000000000000 --- a/examples/bfetch_explorer/public/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { BfetchExplorerPlugin } from './plugin'; - -export const plugin = () => new BfetchExplorerPlugin(); diff --git a/examples/bfetch_explorer/public/mount.tsx b/examples/bfetch_explorer/public/mount.tsx deleted file mode 100644 index 525f7b21078f0..0000000000000 --- a/examples/bfetch_explorer/public/mount.tsx +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import * as React from 'react'; -import { render, unmountComponentAtNode } from 'react-dom'; -import { CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public'; -import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; -import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render'; -import { BfetchExplorerStartPlugins, ExplorerService } from './plugin'; -import { App } from './containers/app'; - -export interface BfetchDeps { - appBasePath: string; - core: CoreStart; - plugins: BfetchExplorerStartPlugins; - explorer: ExplorerService; -} - -export const mount = - (coreSetup: CoreSetup, explorer: ExplorerService) => - async ({ appBasePath, element }: AppMountParameters) => { - const [core, plugins] = await coreSetup.getStartServices(); - const deps: BfetchDeps = { appBasePath, core, plugins, explorer }; - const reactElement = ( - - - - - - ); - render(reactElement, element); - return () => unmountComponentAtNode(element); - }; diff --git a/examples/bfetch_explorer/public/plugin.tsx b/examples/bfetch_explorer/public/plugin.tsx deleted file mode 100644 index 2840f016b5d2b..0000000000000 --- a/examples/bfetch_explorer/public/plugin.tsx +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Plugin, CoreSetup } from '@kbn/core/public'; -import { BfetchPublicSetup, BfetchPublicStart } from '@kbn/bfetch-plugin/public'; -import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public'; -import { mount } from './mount'; - -export interface ExplorerService { - double: (number: { num: number }) => Promise<{ num: number }>; -} - -export interface BfetchExplorerSetupPlugins { - bfetch: BfetchPublicSetup; - developerExamples: DeveloperExamplesSetup; -} - -export interface BfetchExplorerStartPlugins { - bfetch: BfetchPublicStart; -} - -export class BfetchExplorerPlugin implements Plugin { - public setup( - core: CoreSetup, - { bfetch, developerExamples }: BfetchExplorerSetupPlugins - ) { - const double = bfetch.batchedFunction<{ num: number }, { num: number }>({ - url: '/bfetch_explorer/double', - }); - - const explorer: ExplorerService = { - double, - }; - - core.application.register({ - id: 'bfetch-explorer', - title: 'bfetch explorer', - visibleIn: [], - mount: mount(core, explorer), - }); - - developerExamples.register({ - appId: 'bfetch-explorer', - title: 'bfetch', - description: - 'bfetch is a service that allows to batch HTTP requests and streams responses back.', - links: [ - { - label: 'README', - href: 'https://github.com/elastic/kibana/blob/main/src/plugins/bfetch/README.md', - iconType: 'logoGithub', - size: 's', - target: '_blank', - }, - ], - }); - } - - public start() {} - public stop() {} -} diff --git a/examples/bfetch_explorer/public/routes.tsx b/examples/bfetch_explorer/public/routes.tsx deleted file mode 100644 index 69ae6a8e94bbb..0000000000000 --- a/examples/bfetch_explorer/public/routes.tsx +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import React from 'react'; -import { PageDoubleIntegers } from './containers/app/pages/page_double_integers'; -import { PageCountUntil } from './containers/app/pages/page_count_until'; - -interface RouteSectionDef { - title: string; - id: string; - items: RouteDef[]; -} - -interface RouteDef { - title: string; - id: string; - component: React.ReactNode; -} - -export const routes: RouteSectionDef[] = [ - { - title: 'fetchStreaming', - id: 'fetchStreaming', - items: [ - { - title: 'Count until', - id: 'count-until', - component: , - }, - ], - }, - { - title: 'batchedFunction', - id: 'batchedFunction', - items: [ - { - title: 'Double integers', - id: 'double-integers', - component: , - }, - ], - }, -]; diff --git a/examples/bfetch_explorer/server/index.ts b/examples/bfetch_explorer/server/index.ts deleted file mode 100644 index ef09a9627b139..0000000000000 --- a/examples/bfetch_explorer/server/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export const plugin = async () => { - const { BfetchExplorerPlugin } = await import('./plugin'); - return new BfetchExplorerPlugin(); -}; diff --git a/examples/bfetch_explorer/server/plugin.ts b/examples/bfetch_explorer/server/plugin.ts deleted file mode 100644 index 41dd5ab4f4601..0000000000000 --- a/examples/bfetch_explorer/server/plugin.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Subject } from 'rxjs'; -import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server'; -import { BfetchServerSetup, BfetchServerStart } from '@kbn/bfetch-plugin/server'; - -export interface BfetchExplorerSetupPlugins { - bfetch: BfetchServerSetup; -} - -export interface BfetchExplorerStartPlugins { - bfetch: BfetchServerStart; -} - -export class BfetchExplorerPlugin implements Plugin { - public setup(core: CoreSetup, plugins: BfetchExplorerSetupPlugins) { - plugins.bfetch.addStreamingResponseRoute('/bfetch_explorer/count', () => ({ - getResponseStream: ({ data }: any) => { - const subject = new Subject(); - const countTo = Number(data); - for (let cnt = 1; cnt <= countTo; cnt++) { - setTimeout(() => { - subject.next(String(cnt)); - }, cnt * 1000); - } - setTimeout(() => { - subject.complete(); - }, countTo * 1000); - return subject; - }, - })); - - plugins.bfetch.addBatchProcessingRoute<{ num: number }, { num: number }>( - '/bfetch_explorer/double', - () => ({ - onBatchItem: async ({ num }) => { - // Validate inputs. - if (num < 0) throw new Error('Invalid number'); - // Wait number of specified milliseconds. - await new Promise((r) => setTimeout(r, num)); - // Double the number and send it back. - return { num: 2 * num }; - }, - }) - ); - } - - public start(core: CoreStart, plugins: BfetchExplorerStartPlugins) {} - - public stop() {} -} diff --git a/examples/bfetch_explorer/tsconfig.json b/examples/bfetch_explorer/tsconfig.json deleted file mode 100644 index c8417c734f58d..0000000000000 --- a/examples/bfetch_explorer/tsconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "target/types", - }, - "include": [ - "index.ts", - "public/**/*.ts", - "public/**/*.tsx", - "server/**/*.ts", - "../../typings/**/*", - ], - "exclude": [ - "target/**/*", - ], - "kbn_references": [ - "@kbn/core", - "@kbn/developer-examples-plugin", - "@kbn/bfetch-plugin", - "@kbn/kibana-react-plugin", - "@kbn/shared-ux-router", - "@kbn/react-kibana-context-render", - ] -} diff --git a/package.json b/package.json index cda08f1a5b06f..ec63a04283ba7 100644 --- a/package.json +++ b/package.json @@ -194,9 +194,6 @@ "@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log", "@kbn/avc-banner": "link:packages/kbn-avc-banner", "@kbn/banners-plugin": "link:x-pack/plugins/banners", - "@kbn/bfetch-error": "link:packages/kbn-bfetch-error", - "@kbn/bfetch-explorer-plugin": "link:examples/bfetch_explorer", - "@kbn/bfetch-plugin": "link:src/plugins/bfetch", "@kbn/calculate-auto": "link:packages/kbn-calculate-auto", "@kbn/calculate-width-from-char-count": "link:packages/kbn-calculate-width-from-char-count", "@kbn/canvas-plugin": "link:x-pack/plugins/canvas", diff --git a/packages/kbn-bfetch-error/BUILD.bazel b/packages/kbn-bfetch-error/BUILD.bazel deleted file mode 100644 index 88cb5bbe5b9e8..0000000000000 --- a/packages/kbn-bfetch-error/BUILD.bazel +++ /dev/null @@ -1,35 +0,0 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "js_library") - -SRCS = glob( - [ - "**/*.ts", - "**/*.tsx", - ], - exclude = [ - "**/test_helpers.ts", - "**/*.config.js", - "**/*.mock.*", - "**/*.test.*", - "**/*.stories.*", - "**/__snapshots__/**", - "**/integration_tests/**", - "**/mocks/**", - "**/scripts/**", - "**/storybook/**", - "**/test_fixtures/**", - "**/test_helpers/**", - ], -) - -BUNDLER_DEPS = [ - "//packages/kbn-i18n", - "@npm//tslib", -] - -js_library( - name = "kbn-bfetch-error", - package_name = "@kbn/bfetch-error", - srcs = ["package.json"] + SRCS, - deps = BUNDLER_DEPS, - visibility = ["//visibility:public"], -) diff --git a/packages/kbn-bfetch-error/README.md b/packages/kbn-bfetch-error/README.md deleted file mode 100644 index c44118eef53a6..0000000000000 --- a/packages/kbn-bfetch-error/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @kbn/bfetch-error - -package isolating befetch error logic diff --git a/packages/kbn-bfetch-error/index.ts b/packages/kbn-bfetch-error/index.ts deleted file mode 100644 index c8a9f3c91c8ea..0000000000000 --- a/packages/kbn-bfetch-error/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export { BfetchRequestError } from './src/bfetch_error'; diff --git a/packages/kbn-bfetch-error/jest.config.js b/packages/kbn-bfetch-error/jest.config.js deleted file mode 100644 index 88b5bf7b9adc8..0000000000000 --- a/packages/kbn-bfetch-error/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -module.exports = { - preset: '@kbn/test', - rootDir: '../..', - roots: ['/packages/kbn-bfetch-error'], -}; diff --git a/packages/kbn-bfetch-error/kibana.jsonc b/packages/kbn-bfetch-error/kibana.jsonc deleted file mode 100644 index 2cde90d13d99c..0000000000000 --- a/packages/kbn-bfetch-error/kibana.jsonc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "shared-common", - "id": "@kbn/bfetch-error", - "owner": "@elastic/appex-sharedux" -} diff --git a/packages/kbn-bfetch-error/package.json b/packages/kbn-bfetch-error/package.json deleted file mode 100644 index 39e05c4e4be06..0000000000000 --- a/packages/kbn-bfetch-error/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "@kbn/bfetch-error", - "private": true, - "version": "1.0.0", - "license": "Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0" -} \ No newline at end of file diff --git a/packages/kbn-bfetch-error/src/bfetch_error.ts b/packages/kbn-bfetch-error/src/bfetch_error.ts deleted file mode 100644 index 77c5325cdd289..0000000000000 --- a/packages/kbn-bfetch-error/src/bfetch_error.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { i18n } from '@kbn/i18n'; - -/** - * Error thrown when xhr request fails - * @public - */ -export class BfetchRequestError extends Error { - /** - * constructor - * @param code - Xhr error code - */ - constructor(code: number) { - const message = - code === 0 - ? i18n.translate('bfetchError.networkError', { - defaultMessage: 'Check your network connection and try again.', - }) - : i18n.translate('bfetchError.networkErrorWithStatus', { - defaultMessage: 'Check your network connection and try again. Code {code}', - values: { code }, - }); - - super(message); - this.name = 'BfetchRequestError'; - this.code = code; - } - - code: number; -} diff --git a/packages/kbn-bfetch-error/tsconfig.json b/packages/kbn-bfetch-error/tsconfig.json deleted file mode 100644 index c4703bc51cf6c..0000000000000 --- a/packages/kbn-bfetch-error/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "target/types", - "types": [ - "jest", - "node", - "react" - ] - }, - "include": [ - "**/*.ts", - "**/*.tsx", - ], - "exclude": [ - "target/**/*" - ], - "kbn_references": [ - "@kbn/i18n", - ] -} diff --git a/packages/kbn-management/settings/setting_ids/index.ts b/packages/kbn-management/settings/setting_ids/index.ts index b146be6f6e252..f4cc90b9369ae 100644 --- a/packages/kbn-management/settings/setting_ids/index.ts +++ b/packages/kbn-management/settings/setting_ids/index.ts @@ -8,8 +8,6 @@ */ // General settings -export const DISABLE_REQUEST_BATCHING_ID = 'bfetch:disable'; -export const DISABLE_BATCH_COMPRESSION_ID = 'bfetch:disableCompression'; export const CSV_QUOTE_VALUES_ID = 'csv:quoteValues'; export const CSV_SEPARATOR_ID = 'csv:separator'; export const DATE_FORMAT_ID = 'dateFormat'; diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 7936e52ccbf18..d1781932a6987 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -6,7 +6,6 @@ pageLoadAssetSize: alerting: 106936 apm: 64385 banners: 17946 - bfetch: 22837 canvas: 29355 cases: 180037 charts: 55000 diff --git a/packages/kbn-search-errors/BUILD.bazel b/packages/kbn-search-errors/BUILD.bazel index b25a9f900f214..7f462f59a85b7 100644 --- a/packages/kbn-search-errors/BUILD.bazel +++ b/packages/kbn-search-errors/BUILD.bazel @@ -22,7 +22,6 @@ SRCS = glob( ) BUNDLER_DEPS = [ - "//packages/kbn-bfetch-error", "//packages/kbn-i18n", "@npm//@elastic/elasticsearch", "@npm//@elastic/eui", diff --git a/packages/kbn-search-errors/src/render_search_error.ts b/packages/kbn-search-errors/src/render_search_error.ts index 4cbf784c35e22..037af2bdb0ee0 100644 --- a/packages/kbn-search-errors/src/render_search_error.ts +++ b/packages/kbn-search-errors/src/render_search_error.ts @@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n'; import { ReactNode } from 'react'; -import { BfetchRequestError } from '@kbn/bfetch-error'; import { EsError } from './es_error'; export function renderSearchError( @@ -25,7 +24,7 @@ export function renderSearchError( }; } - if (error.constructor.name === 'HttpFetchError' || error instanceof BfetchRequestError) { + if (error.constructor.name === 'HttpFetchError') { const defaultMsg = i18n.translate('searchErrors.errors.fetchError', { defaultMessage: 'Check your network connection and try again.', }); diff --git a/packages/kbn-search-errors/tsconfig.json b/packages/kbn-search-errors/tsconfig.json index d420899bfae32..28c8e52860da0 100644 --- a/packages/kbn-search-errors/tsconfig.json +++ b/packages/kbn-search-errors/tsconfig.json @@ -20,7 +20,6 @@ "@kbn/core", "@kbn/kibana-utils-plugin", "@kbn/data-views-plugin", - "@kbn/bfetch-error", "@kbn/search-types", ] } diff --git a/src/plugins/bfetch/README.md b/src/plugins/bfetch/README.md deleted file mode 100644 index 9ed90a4de306e..0000000000000 --- a/src/plugins/bfetch/README.md +++ /dev/null @@ -1,56 +0,0 @@ -# `bfetch` plugin - -`bfetch` allows to batch HTTP requests and streams responses back. - - -# Example - -We will create a batch processing endpoint that receives a number then doubles it -and streams it back. We will also consider the number to be time in milliseconds -and before streaming the number back the server will wait for the specified number of -milliseconds. - -To do that, first create server-side batch processing route using [`addBatchProcessingRoute`](./docs/server/reference.md#addBatchProcessingRoute). - -```ts -plugins.bfetch.addBatchProcessingRoute<{ num: number }, { num: number }>( - '/my-plugin/double', - () => ({ - onBatchItem: async ({ num }) => { - // Validate inputs. - if (num < 0) throw new Error('Invalid number'); - // Wait number of specified milliseconds. - await new Promise(r => setTimeout(r, num)); - // Double the number and send it back. - return { num: 2 * num }; - }, - }) -); -``` - -Now on client-side create `double` function using [`batchedFunction`](./docs/browser/reference.md#batchedFunction). -The newly created `double` function can be called many times and it -will package individual calls into batches and send them to the server. - -```ts -const double = plugins.bfetch.batchedFunction<{ num: number }, { num: number }>({ - url: '/my-plugin/double', -}); -``` - -Note: the created `double` must accept a single object argument (`{ num: number }` in this case) -and it will return a promise that resolves into an object, too (also `{ num: number }` in this case). - -Use the `double` function. - -```ts -double({ num: 1 }).then(console.log, console.error); // { num: 2 } -double({ num: 2 }).then(console.log, console.error); // { num: 4 } -double({ num: 3 }).then(console.log, console.error); // { num: 6 } -``` - - -## Reference - -- [Browser](./docs/browser/reference.md) -- [Server](./docs/server/reference.md) diff --git a/src/plugins/bfetch/common/batch.ts b/src/plugins/bfetch/common/batch.ts deleted file mode 100644 index cc66367b01ab0..0000000000000 --- a/src/plugins/bfetch/common/batch.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export interface ErrorLike { - message: string; -} - -export interface BatchRequestData { - batch: Item[]; -} - -export interface BatchResponseItem { - id: number; - result?: Result; - error?: Error; -} - -export interface BatchItemWrapper { - compressed: boolean; - payload: string; -} diff --git a/src/plugins/bfetch/common/buffer/create_batched_function.test.ts b/src/plugins/bfetch/common/buffer/create_batched_function.test.ts deleted file mode 100644 index 2953eaf967c94..0000000000000 --- a/src/plugins/bfetch/common/buffer/create_batched_function.test.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { createBatchedFunction } from './create_batched_function'; - -describe('createBatchedFunction', () => { - test('calls onCall every time fn is called, calls onBatch once flushOnMaxItems reached', async () => { - const onBatch = jest.fn(); - const onCall = jest.fn(() => [1, 2] as any); - const [fn] = createBatchedFunction({ - onBatch, - onCall, - flushOnMaxItems: 2, - maxItemAge: 10, - }); - - expect(onCall).toHaveBeenCalledTimes(0); - expect(onBatch).toHaveBeenCalledTimes(0); - - fn(123); - - expect(onCall).toHaveBeenCalledTimes(1); - expect(onCall).toHaveBeenCalledWith(123); - expect(onBatch).toHaveBeenCalledTimes(0); - - fn(456); - - expect(onCall).toHaveBeenCalledTimes(2); - expect(onCall).toHaveBeenCalledWith(456); - expect(onBatch).toHaveBeenCalledTimes(1); - expect(onBatch).toHaveBeenCalledWith([2, 2]); - }); - - test('calls onBatch once timeout is reached', async () => { - const onBatch = jest.fn(); - const onCall = jest.fn(() => [4, 3] as any); - const [fn] = createBatchedFunction({ - onBatch, - onCall, - flushOnMaxItems: 2, - maxItemAge: 10, - }); - - expect(onCall).toHaveBeenCalledTimes(0); - expect(onBatch).toHaveBeenCalledTimes(0); - - fn(123); - - expect(onCall).toHaveBeenCalledTimes(1); - expect(onCall).toHaveBeenCalledWith(123); - expect(onBatch).toHaveBeenCalledTimes(0); - - await new Promise((r) => setTimeout(r, 15)); - - expect(onCall).toHaveBeenCalledTimes(1); - expect(onBatch).toHaveBeenCalledTimes(1); - expect(onBatch).toHaveBeenCalledWith([3]); - }); -}); diff --git a/src/plugins/bfetch/common/buffer/create_batched_function.ts b/src/plugins/bfetch/common/buffer/create_batched_function.ts deleted file mode 100644 index b87d45050b3c9..0000000000000 --- a/src/plugins/bfetch/common/buffer/create_batched_function.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import type { ItemBufferParams, TimedItemBufferParams } from '@kbn/item-buffer'; -import { TimedItemBuffer } from '@kbn/item-buffer'; - -type Fn = (...args: any) => any; - -export interface BatchedFunctionParams { - onCall: (...args: Parameters) => [ReturnType, BatchEntry]; - onBatch: (items: BatchEntry[]) => void; - flushOnMaxItems?: ItemBufferParams['flushOnMaxItems']; - maxItemAge?: TimedItemBufferParams['maxItemAge']; -} - -export const createBatchedFunction = ( - params: BatchedFunctionParams -): [Func, TimedItemBuffer] => { - const { onCall, onBatch, maxItemAge = 10, flushOnMaxItems = 25 } = params; - const buffer = new TimedItemBuffer({ - onFlush: onBatch, - maxItemAge, - flushOnMaxItems, - }); - - const fn: Func = ((...args) => { - const [result, batchEntry] = onCall(...args); - buffer.write(batchEntry); - return result; - }) as Func; - - return [fn, buffer]; -}; diff --git a/src/plugins/bfetch/common/buffer/index.ts b/src/plugins/bfetch/common/buffer/index.ts deleted file mode 100644 index 5ec864329f456..0000000000000 --- a/src/plugins/bfetch/common/buffer/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './create_batched_function'; diff --git a/src/plugins/bfetch/common/constants.ts b/src/plugins/bfetch/common/constants.ts deleted file mode 100644 index 928eca32e1895..0000000000000 --- a/src/plugins/bfetch/common/constants.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export const DISABLE_BFETCH_COMPRESSION = 'bfetch:disableCompression'; -export const DISABLE_BFETCH = 'bfetch:disable'; -export const BFETCH_ROUTE_VERSION_LATEST = '1'; diff --git a/src/plugins/bfetch/common/index.ts b/src/plugins/bfetch/common/index.ts deleted file mode 100644 index 40983f7c81374..0000000000000 --- a/src/plugins/bfetch/common/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export { normalizeError, removeLeadingSlash, appendQueryParam } from './util'; -export type { StreamingResponseHandler } from './streaming'; -export { type BatchedFunctionParams, createBatchedFunction } from './buffer'; -export type { ErrorLike, BatchRequestData, BatchResponseItem, BatchItemWrapper } from './batch'; -export { - DISABLE_BFETCH_COMPRESSION, - DISABLE_BFETCH, - BFETCH_ROUTE_VERSION_LATEST, -} from './constants'; diff --git a/src/plugins/bfetch/common/streaming/index.ts b/src/plugins/bfetch/common/streaming/index.ts deleted file mode 100644 index 34d385a3f5d62..0000000000000 --- a/src/plugins/bfetch/common/streaming/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './types'; diff --git a/src/plugins/bfetch/common/streaming/types.ts b/src/plugins/bfetch/common/streaming/types.ts deleted file mode 100644 index e25f04b17f73f..0000000000000 --- a/src/plugins/bfetch/common/streaming/types.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Observable } from 'rxjs'; - -export interface StreamingResponseHandler { - getResponseStream(payload: Payload): Observable; -} diff --git a/src/plugins/bfetch/common/types.ts b/src/plugins/bfetch/common/types.ts deleted file mode 100644 index 027d368e1ba94..0000000000000 --- a/src/plugins/bfetch/common/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './streaming/types'; diff --git a/src/plugins/bfetch/common/util/index.ts b/src/plugins/bfetch/common/util/index.ts deleted file mode 100644 index 6be4ad79b6000..0000000000000 --- a/src/plugins/bfetch/common/util/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './normalize_error'; -export * from './remove_leading_slash'; -export * from './query_params'; diff --git a/src/plugins/bfetch/common/util/normalize_error.ts b/src/plugins/bfetch/common/util/normalize_error.ts deleted file mode 100644 index 43e9c0958f909..0000000000000 --- a/src/plugins/bfetch/common/util/normalize_error.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { BfetchRequestError } from '@kbn/bfetch-error'; -import { ErrorLike } from '../batch'; - -export const normalizeError = (err: any): E => { - if (!err) { - return { - message: 'Unknown error.', - } as E; - } - if (err instanceof BfetchRequestError) { - // ignoring so we can return the error as is - // @ts-expect-error - return err; - } - if (err instanceof Error) { - return { message: err.message } as E; - } - if (typeof err === 'object') { - return { - ...err, - message: err.message || 'Unknown error.', - } as E; - } - return { - message: String(err), - } as E; -}; diff --git a/src/plugins/bfetch/common/util/query_params.ts b/src/plugins/bfetch/common/util/query_params.ts deleted file mode 100644 index 6c5233ff7daa4..0000000000000 --- a/src/plugins/bfetch/common/util/query_params.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export const appendQueryParam = (url: string, key: string, value: string): string => { - const separator = url.includes('?') ? '&' : '?'; - return `${url}${separator}${key}=${value}`; -}; diff --git a/src/plugins/bfetch/common/util/remove_leading_slash.ts b/src/plugins/bfetch/common/util/remove_leading_slash.ts deleted file mode 100644 index ad942541720ef..0000000000000 --- a/src/plugins/bfetch/common/util/remove_leading_slash.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export const removeLeadingSlash = (text: string) => (text[0] === '/' ? text.substr(1) : text); diff --git a/src/plugins/bfetch/docs/browser/reference.md b/src/plugins/bfetch/docs/browser/reference.md deleted file mode 100644 index 444b1aa08a98e..0000000000000 --- a/src/plugins/bfetch/docs/browser/reference.md +++ /dev/null @@ -1,44 +0,0 @@ -# `bfetch` browser reference - -- [`batchedFunction`](#batchedFunction) -- [`fetchStreaming`](#fetchStreaming) - - -## `batchedFunction` - -Creates a function that will buffer its calls (until timeout—10ms default— or capacity reached—25 default) -and send all calls in one batch to the specified endpoint. The endpoint is expected -to stream results back in ND-JSON format using `Transfer-Encoding: chunked`, which is -implemented by `addBatchProcessingRoute` server-side method of `bfetch` plugin. - -The created function is expected to be called with a single object argument and will -return a promise that will resolve to an object. - -```ts -const fn = bfetch.batchedFunction({ url: '/my-plugin/something' }); - -const result = await fn({ foo: 'bar' }); -``` - -Options: - -- `url` — URL endpoint that will receive a batch of requests. This endpoint is expected - to receive batch as a serialized JSON array. It should stream responses back - in ND-JSON format using `Transfer-Encoding: chunked` HTTP/1 streaming. -- `fetchStreaming` — The instance of `fetchStreaming` function that will perform ND-JSON handling. - There should be a version of this function available in setup contract of `bfetch` plugin. -- `flushOnMaxItems` — The maximum size of function call buffer before sending the batch request. -- `maxItemAge` — The maximum timeout in milliseconds of the oldest item in the batch - before sending the batch request. - - -## `fetchStreaming` - -Executes an HTTP request and expects that server streams back results using -HTTP/1 `Transfer-Encoding: chunked`. - -```ts -const { stream } = bfetch.fetchStreaming({ url: 'http://elastic.co' }); - -stream.subscribe(value => {}); -``` diff --git a/src/plugins/bfetch/docs/server/reference.md b/src/plugins/bfetch/docs/server/reference.md deleted file mode 100644 index 424532a50b817..0000000000000 --- a/src/plugins/bfetch/docs/server/reference.md +++ /dev/null @@ -1,54 +0,0 @@ -# `bfetch` server reference - -- [`addBatchProcessingRoute`](#addBatchProcessingRoute) -- [`addStreamingResponseRoute`](#addStreamingResponseRoute) - - -## `addBatchProcessingRoute` - -Sets up a server endpoint that expects to work with [`batchedFunction`](../browser/reference.md#batchedFunction). -The endpoint receives a batch of requests, processes each request and streams results -back immediately as they become available. You only need to implement the -processing of each request (`onBatchItem` function), everything else is handled. - -`onBatchItem` function is called for each individual request in the batch. -`onBatchItem` function receives a single object argument which is the payload -of one request; and it must return a promise that resolves to an object, too. -`onBatchItem` function is allowed to throw, in that case the error will be forwarded -to the browser only to the individual request, the rest of the batch will still continue -executing. - -```ts -plugins.bfetch.addBatchProcessingRoute( - '/my-plugin/double', - request => ({ - onBatchItem: async (payload) => { - // ... - return {}; - }, - }) -); -``` - -`request` is the `KibanaRequest` object. `addBatchProcessingRoute` together with `batchedFunction` -ensure that errors are handled and that all items in the batch get executed. - - -## `addStreamingResponseRoute` - -`addStreamingResponseRoute` is a lower-level interface that receives and `payload` -message returns and observable which results are streamed back as ND-JSON messages -until the observable completes. `addStreamingResponseRoute` does not know about the -type of the messages, it does not handle errors, and it does not have a concept of -batch size—observable can stream any number of messages until it completes. - -```ts -plugins.bfetch.addStreamingResponseRoute('/my-plugin/foo', request => ({ - getResponseStream: (payload) => { - const subject = new Subject(); - setTimeout(() => { subject.next('123'); }, 100); - setTimeout(() => { subject.complete(); }, 200); - return subject; - }, -})); -``` diff --git a/src/plugins/bfetch/jest.config.js b/src/plugins/bfetch/jest.config.js deleted file mode 100644 index 1b98c6b39f043..0000000000000 --- a/src/plugins/bfetch/jest.config.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -module.exports = { - preset: '@kbn/test', - rootDir: '../../..', - roots: ['/src/plugins/bfetch'], - coverageDirectory: '/target/kibana-coverage/jest/src/plugins/bfetch', - coverageReporters: ['text', 'html'], - collectCoverageFrom: ['/src/plugins/bfetch/{common,public,server}/**/*.{ts,tsx}'], -}; diff --git a/src/plugins/bfetch/kibana.jsonc b/src/plugins/bfetch/kibana.jsonc deleted file mode 100644 index 39a8866f3b79b..0000000000000 --- a/src/plugins/bfetch/kibana.jsonc +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "plugin", - "id": "@kbn/bfetch-plugin", - "owner": [ - "@elastic/appex-sharedux" - ], - "group": "platform", - "visibility": "shared", - "description": "Considering using bfetch capabilities when fetching large amounts of data. This services supports batching HTTP requests and streaming responses back.", - "plugin": { - "id": "bfetch", - "browser": true, - "server": true, - "requiredBundles": [ - "kibanaUtils" - ] - } -} \ No newline at end of file diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts deleted file mode 100644 index 3a5aac0ea4ed5..0000000000000 --- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts +++ /dev/null @@ -1,756 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { createStreamingBatchedFunction } from './create_streaming_batched_function'; -import { fetchStreaming as fetchStreamingReal } from '../streaming/fetch_streaming'; -import { AbortError, defer, of } from '@kbn/kibana-utils-plugin/public'; -import { Subject } from 'rxjs'; - -const flushPromises = () => - new Promise((resolve) => jest.requireActual('timers').setImmediate(resolve)); - -const getPromiseState = (promise: Promise): Promise<'resolved' | 'rejected' | 'pending'> => - Promise.race<'resolved' | 'rejected' | 'pending'>([ - new Promise((resolve) => - promise.then( - () => resolve('resolved'), - () => resolve('rejected') - ) - ), - new Promise<'pending'>((resolve) => resolve('pending')).then(() => 'pending'), - ]); - -const isPending = (promise: Promise): Promise => - getPromiseState(promise).then((state) => state === 'pending'); - -const setup = () => { - const xhr = {} as unknown as XMLHttpRequest; - const { promise, resolve, reject } = defer(); - const stream = new Subject(); - - const fetchStreaming = jest.fn(() => ({ - xhr, - promise, - stream, - })) as unknown as jest.SpyInstance & typeof fetchStreamingReal; - - return { - fetchStreaming, - xhr, - promise, - resolve, - reject, - stream, - }; -}; - -describe('createStreamingBatchedFunction()', () => { - beforeAll(() => { - jest.useFakeTimers({ legacyFakeTimers: true }); - }); - - afterAll(() => { - jest.useRealTimers(); - }); - test('returns a function', () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - getIsCompressionDisabled: () => true, - }); - expect(typeof fn).toBe('function'); - }); - - test('returned function is async', () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - getIsCompressionDisabled: () => true, - }); - const res = fn({}); - expect(typeof res.then).toBe('function'); - }); - - describe('when timeout is reached', () => { - test('dispatches batch', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - expect(fetchStreaming).toHaveBeenCalledTimes(0); - fn({ foo: 'bar' }); - expect(fetchStreaming).toHaveBeenCalledTimes(0); - fn({ baz: 'quix' }); - expect(fetchStreaming).toHaveBeenCalledTimes(0); - jest.advanceTimersByTime(6); - - expect(fetchStreaming).toHaveBeenCalledTimes(1); - }); - - test('does nothing is buffer is empty', async () => { - const { fetchStreaming } = setup(); - createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - expect(fetchStreaming).toHaveBeenCalledTimes(0); - jest.advanceTimersByTime(6); - expect(fetchStreaming).toHaveBeenCalledTimes(0); - }); - - test('sends POST request to correct endpoint', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - fn({ foo: 'bar' }); - jest.advanceTimersByTime(6); - - expect(fetchStreaming.mock.calls[0][0]).toMatchObject({ - url: '/test', - method: 'POST', - }); - }); - - test('collects calls into an array batch ordered by in same order as calls', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - fn({ foo: 'bar' }); - fn({ baz: 'quix' }); - - jest.advanceTimersByTime(6); - const { body } = fetchStreaming.mock.calls[0][0]; - expect(JSON.parse(body)).toEqual({ - batch: [{ foo: 'bar' }, { baz: 'quix' }], - }); - }); - }); - - describe('when buffer becomes full', () => { - test('dispatches batch request', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - expect(fetchStreaming).toHaveBeenCalledTimes(0); - fn({ foo: 'bar' }); - expect(fetchStreaming).toHaveBeenCalledTimes(0); - fn({ baz: 'quix' }); - expect(fetchStreaming).toHaveBeenCalledTimes(0); - fn({ full: 'yep' }); - expect(fetchStreaming).toHaveBeenCalledTimes(1); - }); - - test('ignores a request with an aborted signal', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const abortController = new AbortController(); - abortController.abort(); - - of(fn({ foo: 'bar' }, abortController.signal)); - fn({ baz: 'quix' }); - - jest.advanceTimersByTime(6); - const { body } = fetchStreaming.mock.calls[0][0]; - expect(JSON.parse(body)).toEqual({ - batch: [{ baz: 'quix' }], - }); - }); - - test("doesn't send batch request if all items have been aborted", async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const abortController = new AbortController(); - abortController.abort(); - - expect.assertions(3); - const req1 = fn({ foo: 'bar' }, abortController.signal).catch((e) => - expect(e).toBeInstanceOf(AbortError) - ); - const req2 = fn({ baz: 'quix' }, abortController.signal).catch((e) => - expect(e).toBeInstanceOf(AbortError) - ); - - jest.advanceTimersByTime(6); - expect(fetchStreaming).not.toBeCalled(); - - await Promise.all([req1, req2]); - }); - - test('sends POST request to correct endpoint with items in array batched sorted in call order', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - fn({ a: '1' }); - fn({ b: '2' }); - fn({ c: '3' }); - - expect(fetchStreaming.mock.calls[0][0]).toMatchObject({ - url: '/test', - method: 'POST', - }); - const { body } = fetchStreaming.mock.calls[0][0]; - expect(JSON.parse(body)).toEqual({ - batch: [{ a: '1' }, { b: '2' }, { c: '3' }], - }); - }); - - test('dispatches batch on full buffer and also on timeout', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - fn({ a: '1' }); - fn({ b: '2' }); - fn({ c: '3' }); - expect(fetchStreaming).toHaveBeenCalledTimes(1); - fn({ d: '4' }); - jest.advanceTimersByTime(6); - expect(fetchStreaming).toHaveBeenCalledTimes(2); - }); - }); - - describe('when receiving results', () => { - test('does not resolve call promises until request finishes', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = fn({ a: '1' }); - const promise2 = fn({ b: '2' }); - jest.advanceTimersByTime(6); - - expect(await isPending(promise1)).toBe(true); - expect(await isPending(promise2)).toBe(true); - }); - - test('resolves only promise of result that was streamed back', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - await flushPromises(); - - const promise1 = fn({ a: '1' }); - const promise2 = fn({ b: '2' }); - const promise3 = fn({ c: '3' }); - jest.advanceTimersByTime(6); - - expect(await isPending(promise1)).toBe(true); - expect(await isPending(promise2)).toBe(true); - expect(await isPending(promise3)).toBe(true); - - stream.next( - JSON.stringify({ - id: 1, - result: { foo: 'bar' }, - }) + '\n' - ); - - expect(await isPending(promise1)).toBe(true); - expect(await isPending(promise2)).toBe(false); - expect(await isPending(promise3)).toBe(true); - - stream.next( - JSON.stringify({ - id: 0, - result: { foo: 'bar 2' }, - }) + '\n' - ); - - expect(await isPending(promise1)).toBe(false); - expect(await isPending(promise2)).toBe(false); - expect(await isPending(promise3)).toBe(true); - }); - - test('resolves each promise with correct data', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = fn({ a: '1' }); - const promise2 = fn({ b: '2' }); - const promise3 = fn({ c: '3' }); - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 1, - result: { foo: 'bar' }, - }) + '\n' - ); - stream.next( - JSON.stringify({ - id: 2, - result: { foo: 'bar 2' }, - }) + '\n' - ); - - expect(await isPending(promise1)).toBe(true); - expect(await isPending(promise2)).toBe(false); - expect(await isPending(promise3)).toBe(false); - expect(await promise2).toEqual({ foo: 'bar' }); - expect(await promise3).toEqual({ foo: 'bar 2' }); - }); - - test('compression is false by default', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - flushOnMaxItems: 1, - fetchStreaming, - }); - - fn({ a: '1' }); - - const dontCompress = await fetchStreaming.mock.calls[0][0].getIsCompressionDisabled(); - expect(dontCompress).toBe(false); - }); - - test('resolves falsy results', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = fn({ a: '1' }); - const promise2 = fn({ b: '2' }); - const promise3 = fn({ c: '3' }); - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 0, - result: false, - }) + '\n' - ); - stream.next( - JSON.stringify({ - id: 1, - result: 0, - }) + '\n' - ); - stream.next( - JSON.stringify({ - id: 2, - result: '', - }) + '\n' - ); - - expect(await isPending(promise1)).toBe(false); - expect(await isPending(promise2)).toBe(false); - expect(await isPending(promise3)).toBe(false); - expect(await promise1).toEqual(false); - expect(await promise2).toEqual(0); - expect(await promise3).toEqual(''); - }); - - test('rejects promise on error response', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise = fn({ a: '1' }); - jest.advanceTimersByTime(6); - - expect(await isPending(promise)).toBe(true); - - stream.next( - JSON.stringify({ - id: 0, - error: { message: 'oops' }, - }) + '\n' - ); - - expect(await isPending(promise)).toBe(false); - const [, error] = await of(promise); - expect(error).toEqual({ - message: 'oops', - }); - }); - - test('resolves successful requests even after rejected ones', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - const promise3 = of(fn({ a: '3' })); - - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 2, - result: { b: '3' }, - }) + '\n' - ); - - jest.advanceTimersByTime(1); - - stream.next( - JSON.stringify({ - id: 1, - error: { b: '2' }, - }) + '\n' - ); - - jest.advanceTimersByTime(1); - - stream.next( - JSON.stringify({ - id: 0, - result: { b: '1' }, - }) + '\n' - ); - - jest.advanceTimersByTime(1); - - const [result1] = await promise1; - const [, error2] = await promise2; - const [result3] = await promise3; - - expect(result1).toEqual({ b: '1' }); - expect(error2).toEqual({ b: '2' }); - expect(result3).toEqual({ b: '3' }); - }); - - describe('when requests are aborted', () => { - test('aborts stream when all are aborted', async () => { - const { fetchStreaming } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const abortController = new AbortController(); - const promise = fn({ a: '1' }, abortController.signal); - const promise2 = fn({ a: '2' }, abortController.signal); - jest.advanceTimersByTime(6); - - expect(await isPending(promise)).toBe(true); - expect(await isPending(promise2)).toBe(true); - - abortController.abort(); - jest.advanceTimersByTime(6); - await flushPromises(); - - expect(await isPending(promise)).toBe(false); - expect(await isPending(promise2)).toBe(false); - const [, error] = await of(promise); - const [, error2] = await of(promise2); - expect(error).toBeInstanceOf(AbortError); - expect(error2).toBeInstanceOf(AbortError); - expect(fetchStreaming.mock.calls[0][0].signal.aborted).toBeTruthy(); - }); - - test('rejects promise on abort and lets others continue', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const abortController = new AbortController(); - const promise = fn({ a: '1' }, abortController.signal); - const promise2 = fn({ a: '2' }); - jest.advanceTimersByTime(6); - - expect(await isPending(promise)).toBe(true); - - abortController.abort(); - jest.advanceTimersByTime(6); - await flushPromises(); - - expect(await isPending(promise)).toBe(false); - const [, error] = await of(promise); - expect(error).toBeInstanceOf(AbortError); - - stream.next( - JSON.stringify({ - id: 1, - result: { b: '2' }, - }) + '\n' - ); - - jest.advanceTimersByTime(1); - - const [result2] = await of(promise2); - expect(result2).toEqual({ b: '2' }); - }); - }); - - describe('when stream closes prematurely', () => { - test('rejects pending promises with CONNECTION error code', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - - jest.advanceTimersByTime(6); - - stream.complete(); - - jest.advanceTimersByTime(1); - - const [, error1] = await promise1; - const [, error2] = await promise2; - expect(error1).toMatchObject({ - message: 'Connection terminated prematurely.', - code: 'CONNECTION', - }); - expect(error2).toMatchObject({ - message: 'Connection terminated prematurely.', - code: 'CONNECTION', - }); - }); - - test('rejects with CONNECTION error only pending promises', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 1, - result: { b: '1' }, - }) + '\n' - ); - stream.complete(); - - jest.advanceTimersByTime(1); - - const [, error1] = await promise1; - const [result1] = await promise2; - expect(error1).toMatchObject({ - message: 'Connection terminated prematurely.', - code: 'CONNECTION', - }); - expect(result1).toMatchObject({ - b: '1', - }); - }); - }); - - describe('when stream errors', () => { - test('rejects pending promises with STREAM error code', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - - jest.advanceTimersByTime(6); - - stream.error({ - message: 'something went wrong', - }); - - jest.advanceTimersByTime(1); - - const [, error1] = await promise1; - const [, error2] = await promise2; - expect(error1).toMatchObject({ - message: 'something went wrong', - code: 'STREAM', - }); - expect(error2).toMatchObject({ - message: 'something went wrong', - code: 'STREAM', - }); - }); - - test('rejects with STREAM error only pending promises', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 1, - result: { b: '1' }, - }) + '\n' - ); - stream.error('oops'); - - jest.advanceTimersByTime(1); - - const [, error1] = await promise1; - const [result1] = await promise2; - expect(error1).toMatchObject({ - message: 'oops', - code: 'STREAM', - }); - expect(result1).toMatchObject({ - b: '1', - }); - }); - }); - - test('rejects with STREAM error on JSON parse error only pending promises', async () => { - const { fetchStreaming, stream } = setup(); - const fn = createStreamingBatchedFunction({ - url: '/test', - fetchStreaming, - maxItemAge: 5, - flushOnMaxItems: 3, - getIsCompressionDisabled: () => true, - }); - await flushPromises(); - - const promise1 = of(fn({ a: '1' })); - const promise2 = of(fn({ a: '2' })); - - jest.advanceTimersByTime(6); - - stream.next( - JSON.stringify({ - id: 1, - result: { b: '1' }, - }) + '\n' - ); - - stream.next('Not a JSON\n'); - - jest.advanceTimersByTime(1); - - const [, error1] = await promise1; - const [result1] = await promise2; - expect(error1).toMatchObject({ - message: `Unexpected token 'N', "Not a JSON\n" is not valid JSON`, - code: 'STREAM', - }); - expect(result1).toMatchObject({ - b: '1', - }); - }); - }); -}); diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts deleted file mode 100644 index 799aef494a19e..0000000000000 --- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { AbortError, abortSignalToPromise, defer } from '@kbn/kibana-utils-plugin/public'; -import type { ItemBufferParams, TimedItemBufferParams } from '@kbn/item-buffer'; -import { createBatchedFunction, ErrorLike, normalizeError } from '../../common'; -import { fetchStreaming } from '../streaming'; -import { BatchedFunc, BatchItem } from './types'; - -export interface BatchedFunctionProtocolError extends ErrorLike { - code: string; -} - -export interface StreamingBatchedFunctionParams { - /** - * URL endpoint that will receive a batch of requests. This endpoint is expected - * to receive batch as a serialized JSON array. It should stream responses back - * in ND-JSON format using `Transfer-Encoding: chunked` HTTP/1 streaming. - */ - url: string; - - /** - * The instance of `fetchStreaming` function that will perform ND-JSON handling. - * There should be a version of this function available in setup contract of `bfetch` - * plugin. - */ - fetchStreaming?: typeof fetchStreaming; - - /** - * The maximum size of function call buffer before sending the batch request. - */ - flushOnMaxItems?: ItemBufferParams['flushOnMaxItems']; - - /** - * The maximum timeout in milliseconds of the oldest item in the batch - * before sending the batch request. - */ - maxItemAge?: TimedItemBufferParams['maxItemAge']; - - /** - * Disabled zlib compression of response chunks. - */ - getIsCompressionDisabled?: () => boolean; -} - -/** - * Returns a function that does not execute immediately but buffers the call internally until - * `params.flushOnMaxItems` is reached or after `params.maxItemAge` timeout in milliseconds is reached. Once - * one of those thresholds is reached all buffered calls are sent in one batch to the - * server using `params.fetchStreaming` in a POST request. Responses are streamed back - * and each batch item is resolved once corresponding response is received. - */ -export const createStreamingBatchedFunction = ( - params: StreamingBatchedFunctionParams -): BatchedFunc => { - const { - url, - fetchStreaming: fetchStreamingInjected = fetchStreaming, - flushOnMaxItems = 25, - maxItemAge = 10, - getIsCompressionDisabled = () => false, - } = params; - const [fn] = createBatchedFunction({ - onCall: (payload: Payload, signal?: AbortSignal) => { - const future = defer(); - const entry: BatchItem = { - payload, - future, - signal, - }; - return [future.promise, entry]; - }, - onBatch: async (items) => { - try { - // Filter out any items whose signal is already aborted - items = items.filter((item) => { - if (item.signal?.aborted) item.future.reject(new AbortError()); - return !item.signal?.aborted; - }); - - if (items.length === 0) { - return; // all items have been aborted before a request has been sent - } - - const donePromises: Array> = items.map((item) => { - return new Promise((resolve) => { - const { promise: abortPromise, cleanup } = item.signal - ? abortSignalToPromise(item.signal) - : { - promise: undefined, - cleanup: () => {}, - }; - - const onDone = () => { - resolve(); - cleanup(); - }; - if (abortPromise) - abortPromise.catch(() => { - item.future.reject(new AbortError()); - onDone(); - }); - item.future.promise.then(onDone, onDone); - }); - }); - - // abort when all items were either resolved, rejected or aborted - const abortController = new AbortController(); - let isBatchDone = false; - Promise.all(donePromises).then(() => { - isBatchDone = true; - abortController.abort(); - }); - const batch = items.map((item) => item.payload); - - const { stream } = fetchStreamingInjected({ - url, - body: JSON.stringify({ batch }), - method: 'POST', - signal: abortController.signal, - getIsCompressionDisabled, - }); - - const handleStreamError = (error: any) => { - const normalizedError = normalizeError(error); - normalizedError.code = 'STREAM'; - for (const { future } of items) future.reject(normalizedError); - }; - - stream.subscribe({ - next: (json: string) => { - try { - const response = JSON.parse(json); - if (response.error) { - items[response.id].future.reject(response.error); - } else if (response.result !== undefined) { - items[response.id].future.resolve(response.result); - } - } catch (e) { - handleStreamError(e); - } - }, - error: handleStreamError, - complete: () => { - if (!isBatchDone) { - const error: BatchedFunctionProtocolError = { - message: 'Connection terminated prematurely.', - code: 'CONNECTION', - }; - for (const { future } of items) future.reject(error); - } - }, - }); - await stream.toPromise(); - } catch (error) { - for (const item of items) item.future.reject(error); - } - }, - flushOnMaxItems, - maxItemAge, - }); - - return fn; -}; diff --git a/src/plugins/bfetch/public/batching/index.ts b/src/plugins/bfetch/public/batching/index.ts deleted file mode 100644 index 1285bab9b1ef5..0000000000000 --- a/src/plugins/bfetch/public/batching/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export type { StreamingBatchedFunctionParams } from './create_streaming_batched_function'; -export { createStreamingBatchedFunction } from './create_streaming_batched_function'; diff --git a/src/plugins/bfetch/public/batching/types.ts b/src/plugins/bfetch/public/batching/types.ts deleted file mode 100644 index 1d1708f7366ab..0000000000000 --- a/src/plugins/bfetch/public/batching/types.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Defer } from '@kbn/kibana-utils-plugin/public'; - -export interface BatchItem { - payload: Payload; - future: Defer; - signal?: AbortSignal; -} - -export type BatchedFunc = ( - payload: Payload, - signal?: AbortSignal -) => Promise; diff --git a/src/plugins/bfetch/public/index.ts b/src/plugins/bfetch/public/index.ts deleted file mode 100644 index cdce68a59ce27..0000000000000 --- a/src/plugins/bfetch/public/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { PluginInitializerContext } from '@kbn/core/public'; -import { BfetchPublicPlugin } from './plugin'; - -export type { BfetchPublicSetup, BfetchPublicStart, BfetchPublicContract } from './plugin'; -export { split } from './streaming'; - -export type { BatchedFunc } from './batching/types'; - -export { DISABLE_BFETCH } from '../common/constants'; - -export function plugin(initializerContext: PluginInitializerContext) { - return new BfetchPublicPlugin(initializerContext); -} diff --git a/src/plugins/bfetch/public/mocks.ts b/src/plugins/bfetch/public/mocks.ts deleted file mode 100644 index 20abe00f84e11..0000000000000 --- a/src/plugins/bfetch/public/mocks.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { coreMock } from '@kbn/core/public/mocks'; -import { BfetchPublicSetup, BfetchPublicStart } from '.'; -import { plugin as pluginInitializer } from '.'; - -export type Setup = jest.Mocked; -export type Start = jest.Mocked; - -const createSetupContract = (): Setup => { - const setupContract: Setup = { - fetchStreaming: jest.fn(), - batchedFunction: jest.fn(), - }; - return setupContract; -}; - -const createStartContract = (): Start => { - const startContract: Start = { - fetchStreaming: jest.fn(), - batchedFunction: jest.fn(), - }; - - return startContract; -}; - -const createPlugin = async () => { - const pluginInitializerContext = coreMock.createPluginInitializerContext(); - const coreSetup = coreMock.createSetup(); - const coreStart = coreMock.createStart(); - const plugin = pluginInitializer(pluginInitializerContext); - const setup = await plugin.setup(coreSetup, {}); - - return { - pluginInitializerContext, - coreSetup, - coreStart, - plugin, - setup, - doStart: async () => await plugin.start(coreStart, {}), - }; -}; - -export const bfetchPluginMock = { - createSetupContract, - createStartContract, - createPlugin, -}; diff --git a/src/plugins/bfetch/public/plugin.ts b/src/plugins/bfetch/public/plugin.ts deleted file mode 100644 index 2e1ef59d39b86..0000000000000 --- a/src/plugins/bfetch/public/plugin.ts +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public'; -import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public'; -import { - ELASTIC_HTTP_VERSION_HEADER, - X_ELASTIC_INTERNAL_ORIGIN_REQUEST, -} from '@kbn/core-http-common'; -import { fetchStreaming as fetchStreamingStatic, FetchStreamingParams } from './streaming'; -import { DISABLE_BFETCH_COMPRESSION, removeLeadingSlash } from '../common'; -import { createStreamingBatchedFunction, StreamingBatchedFunctionParams } from './batching'; -import { BatchedFunc } from './batching/types'; -import { BFETCH_ROUTE_VERSION_LATEST } from '../common/constants'; - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface BfetchPublicSetupDependencies {} - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface BfetchPublicStartDependencies {} - -export interface BfetchPublicContract { - fetchStreaming: (params: FetchStreamingParams) => ReturnType; - batchedFunction: ( - params: StreamingBatchedFunctionParams - ) => BatchedFunc; -} - -export type BfetchPublicSetup = BfetchPublicContract; -export type BfetchPublicStart = BfetchPublicContract; - -export class BfetchPublicPlugin - implements - Plugin< - BfetchPublicSetup, - BfetchPublicStart, - BfetchPublicSetupDependencies, - BfetchPublicStartDependencies - > -{ - private contract!: BfetchPublicContract; - - constructor(private readonly initializerContext: PluginInitializerContext) {} - - public setup( - core: CoreSetup, - plugins: BfetchPublicSetupDependencies - ): BfetchPublicSetup { - const { version: kibanaVersion } = this.initializerContext.env.packageInfo; - const basePath = core.http.basePath.get(); - - const startServices = createStartServicesGetter(core.getStartServices); - const getIsCompressionDisabled = () => - startServices().core.uiSettings.get(DISABLE_BFETCH_COMPRESSION); - - const fetchStreaming = this.fetchStreaming( - BFETCH_ROUTE_VERSION_LATEST, - kibanaVersion, - basePath, - getIsCompressionDisabled - ); - const batchedFunction = this.batchedFunction(fetchStreaming, getIsCompressionDisabled); - - this.contract = { - fetchStreaming, - batchedFunction, - }; - - return this.contract; - } - - public start(core: CoreStart, plugins: BfetchPublicStartDependencies): BfetchPublicStart { - return this.contract; - } - - public stop() {} - - private fetchStreaming = - ( - version: string, - kibanaVersion: string, - basePath: string, - getIsCompressionDisabled: () => boolean - ): BfetchPublicSetup['fetchStreaming'] => - (params) => - fetchStreamingStatic({ - ...params, - url: `${basePath}/${removeLeadingSlash(params.url)}`, - headers: { - 'Content-Type': 'application/json', - 'kbn-version': kibanaVersion, - [X_ELASTIC_INTERNAL_ORIGIN_REQUEST]: 'Kibana', - [ELASTIC_HTTP_VERSION_HEADER]: version, - ...(params.headers || {}), - }, - getIsCompressionDisabled, - }); - - private batchedFunction = - ( - fetchStreaming: BfetchPublicContract['fetchStreaming'], - getIsCompressionDisabled: () => boolean - ): BfetchPublicContract['batchedFunction'] => - (params) => - createStreamingBatchedFunction({ - ...params, - getIsCompressionDisabled, - fetchStreaming: params.fetchStreaming || fetchStreaming, - }); -} diff --git a/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts b/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts deleted file mode 100644 index 8e065ce424dd7..0000000000000 --- a/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { fetchStreaming } from './fetch_streaming'; -import { mockXMLHttpRequest } from '../test_helpers/xhr'; -import { promisify } from 'util'; -import { deflate } from 'zlib'; -const pDeflate = promisify(deflate); - -const compressResponse = async (resp: any) => { - const gzipped = await pDeflate(JSON.stringify(resp)); - return gzipped.toString('base64'); -}; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 1)); - -const setup = () => { - const { xhr, XMLHttpRequest } = mockXMLHttpRequest(); - window.XMLHttpRequest = XMLHttpRequest; - (xhr as any).status = 200; - return { xhr }; -}; - -test('returns XHR request', () => { - setup(); - const { xhr } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - expect(typeof xhr.readyState).toBe('number'); -}); - -test('returns stream', () => { - setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - expect(typeof stream.subscribe).toBe('function'); -}); - -test('promise resolves when request completes', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - let resolved = false; - stream.toPromise().then(() => (resolved = true)); - - await tick(); - expect(resolved).toBe(false); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - - await tick(); - expect(resolved).toBe(false); - - (env.xhr as any).responseText = 'foo\nbar'; - env.xhr.onprogress!({} as any); - - await tick(); - expect(resolved).toBe(false); - - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(resolved).toBe(true); -}); - -test('promise resolves when compressed request completes', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => false, - }); - - let resolved = false; - let result; - stream.toPromise().then((r) => { - resolved = true; - result = r; - }); - - await tick(); - expect(resolved).toBe(false); - - const msg = { foo: 'bar' }; - - // Whole message in a response - (env.xhr as any).responseText = `${await compressResponse(msg)}\n`; - env.xhr.onprogress!({} as any); - - await tick(); - expect(resolved).toBe(false); - - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(resolved).toBe(true); - expect(result).toStrictEqual(JSON.stringify(msg)); -}); - -test('promise resolves when compressed chunked request completes', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => false, - }); - - let resolved = false; - let result; - stream.toPromise().then((r) => { - resolved = true; - result = r; - }); - - await tick(); - expect(resolved).toBe(false); - - const msg = { veg: 'tomato' }; - const msgToCut = await compressResponse(msg); - const part1 = msgToCut.substr(0, 3); - - // Message and a half in a response - (env.xhr as any).responseText = part1; - env.xhr.onprogress!({} as any); - - await tick(); - expect(resolved).toBe(false); - - // Half a message in a response - (env.xhr as any).responseText = `${msgToCut}\n`; - env.xhr.onprogress!({} as any); - - await tick(); - expect(resolved).toBe(false); - - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(resolved).toBe(true); - expect(result).toStrictEqual(JSON.stringify(msg)); -}); - -test('streams incoming text as it comes through, according to separators', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - const spy = jest.fn(); - stream.subscribe(spy); - - await tick(); - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo\nbar'; - env.xhr.onprogress!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(1); - expect(spy).toHaveBeenCalledWith('foo'); - - (env.xhr as any).responseText = 'foo\nbar\n'; - env.xhr.onprogress!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(2); - expect(spy).toHaveBeenCalledWith('bar'); - - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(2); -}); - -test('completes stream observable when request finishes', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - const spy = jest.fn(); - stream.subscribe({ - complete: spy, - }); - - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - expect(spy).toHaveBeenCalledTimes(1); -}); - -test('completes stream observable when aborted', async () => { - const env = setup(); - const abort = new AbortController(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - signal: abort.signal, - getIsCompressionDisabled: () => true, - }); - - const spy = jest.fn(); - stream.subscribe({ - complete: spy, - }); - - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - - abort.abort(); - - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 200; - env.xhr.onreadystatechange!({} as any); - - expect(spy).toHaveBeenCalledTimes(1); -}); - -test('promise throws when request errors', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - const spy = jest.fn(); - stream.toPromise().catch(spy); - - await tick(); - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 400; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(1); - expect(spy.mock.calls[0][0]).toBeInstanceOf(Error); - expect(spy.mock.calls[0][0].message).toMatchInlineSnapshot( - `"Check your network connection and try again. Code 400"` - ); -}); - -test('stream observable errors when request errors', async () => { - const env = setup(); - const { stream } = fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - const spy = jest.fn(); - stream.subscribe({ - error: spy, - }); - - await tick(); - expect(spy).toHaveBeenCalledTimes(0); - - (env.xhr as any).responseText = 'foo'; - env.xhr.onprogress!({} as any); - (env.xhr as any).readyState = 4; - (env.xhr as any).status = 400; - env.xhr.onreadystatechange!({} as any); - - await tick(); - expect(spy).toHaveBeenCalledTimes(1); - expect(spy.mock.calls[0][0]).toBeInstanceOf(Error); - expect(spy.mock.calls[0][0].message).toMatchInlineSnapshot( - `"Check your network connection and try again. Code 400"` - ); -}); - -test('sets custom headers', async () => { - const env = setup(); - fetchStreaming({ - url: 'http://example.com', - headers: { - 'Content-Type': 'text/plain', - Authorization: 'Bearer 123', - }, - getIsCompressionDisabled: () => true, - }); - - expect(env.xhr.setRequestHeader).toHaveBeenCalledWith('Content-Type', 'text/plain'); - expect(env.xhr.setRequestHeader).toHaveBeenCalledWith('Authorization', 'Bearer 123'); -}); - -test('uses credentials', async () => { - const env = setup(); - - expect(env.xhr.withCredentials).toBe(false); - - fetchStreaming({ - url: 'http://example.com', - getIsCompressionDisabled: () => true, - }); - - expect(env.xhr.withCredentials).toBe(true); -}); - -test('opens XHR request and sends specified body', async () => { - const env = setup(); - - expect(env.xhr.open).toHaveBeenCalledTimes(0); - expect(env.xhr.send).toHaveBeenCalledTimes(0); - - fetchStreaming({ - url: 'http://elastic.co', - method: 'GET', - body: 'foobar', - getIsCompressionDisabled: () => true, - }); - - expect(env.xhr.open).toHaveBeenCalledTimes(1); - expect(env.xhr.send).toHaveBeenCalledTimes(1); - expect(env.xhr.open).toHaveBeenCalledWith('GET', 'http://elastic.co'); - expect(env.xhr.send).toHaveBeenCalledWith('foobar'); -}); - -test('uses POST request method by default', async () => { - const env = setup(); - fetchStreaming({ - url: 'http://elastic.co', - getIsCompressionDisabled: () => true, - }); - expect(env.xhr.open).toHaveBeenCalledWith('POST', 'http://elastic.co'); -}); diff --git a/src/plugins/bfetch/public/streaming/fetch_streaming.ts b/src/plugins/bfetch/public/streaming/fetch_streaming.ts deleted file mode 100644 index 6df4e72fedc85..0000000000000 --- a/src/plugins/bfetch/public/streaming/fetch_streaming.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { map, share } from 'rxjs'; -import { inflateResponse } from '.'; -import { fromStreamingXhr } from './from_streaming_xhr'; -import { split } from './split'; -import { appendQueryParam } from '../../common'; - -export interface FetchStreamingParams { - url: string; - headers?: Record; - method?: 'GET' | 'POST'; - body?: string; - signal?: AbortSignal; - getIsCompressionDisabled?: () => boolean; -} - -/** - * Sends an AJAX request to the server, and processes the result as a - * streaming HTTP/1 response. Streams data as text through observable. - */ -export function fetchStreaming({ - url, - headers = {}, - method = 'POST', - body = '', - signal, - getIsCompressionDisabled = () => false, -}: FetchStreamingParams) { - const xhr = new window.XMLHttpRequest(); - - const isCompressionDisabled = getIsCompressionDisabled(); - if (!isCompressionDisabled) { - url = appendQueryParam(url, 'compress', 'true'); - } - // Begin the request - xhr.open(method, url); - xhr.withCredentials = true; - - // Set the HTTP headers - Object.entries(headers).forEach(([k, v]) => xhr.setRequestHeader(k, v)); - - const stream = fromStreamingXhr(xhr, signal); - - // Send the payload to the server - xhr.send(body); - - // Return a stream of chunked decompressed messages - const stream$ = stream.pipe( - split('\n'), - map((msg) => { - return isCompressionDisabled ? msg : inflateResponse(msg); - }), - share() - ); - - return { - xhr, - stream: stream$, - }; -} diff --git a/src/plugins/bfetch/public/streaming/from_streaming_xhr.test.ts b/src/plugins/bfetch/public/streaming/from_streaming_xhr.test.ts deleted file mode 100644 index d39dda2e07c0c..0000000000000 --- a/src/plugins/bfetch/public/streaming/from_streaming_xhr.test.ts +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { fromStreamingXhr } from './from_streaming_xhr'; - -const createXhr = (): XMLHttpRequest => - ({ - abort: () => {}, - onprogress: () => {}, - onreadystatechange: () => {}, - readyState: 0, - responseText: '', - status: 200, - } as unknown as XMLHttpRequest); - -test('returns observable', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - expect(typeof observable.subscribe).toBe('function'); -}); - -test('emits an event to observable', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const spy = jest.fn(); - observable.subscribe(spy); - - expect(spy).toHaveBeenCalledTimes(0); - - (xhr as any).responseText = 'foo'; - xhr.onprogress!({} as any); - - expect(spy).toHaveBeenCalledTimes(1); - expect(spy).toHaveBeenCalledWith('foo'); -}); - -test('streams multiple events to observable', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const spy = jest.fn(); - observable.subscribe(spy); - - expect(spy).toHaveBeenCalledTimes(0); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '12'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '123'; - xhr.onprogress!({} as any); - - expect(spy).toHaveBeenCalledTimes(3); - expect(spy.mock.calls[0][0]).toBe('1'); - expect(spy.mock.calls[1][0]).toBe('2'); - expect(spy.mock.calls[2][0]).toBe('3'); -}); - -test('completes observable when request reaches end state', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const next = jest.fn(); - const complete = jest.fn(); - observable.subscribe({ - next, - complete, - }); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '2'; - xhr.onprogress!({} as any); - - expect(complete).toHaveBeenCalledTimes(0); - - (xhr as any).readyState = 4; - (xhr as any).status = 200; - xhr.onreadystatechange!({} as any); - - expect(complete).toHaveBeenCalledTimes(1); -}); - -test('completes observable when aborted', () => { - const xhr = createXhr(); - const abortController = new AbortController(); - const observable = fromStreamingXhr(xhr, abortController.signal); - - const next = jest.fn(); - const complete = jest.fn(); - observable.subscribe({ - next, - complete, - }); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '2'; - xhr.onprogress!({} as any); - - expect(complete).toHaveBeenCalledTimes(0); - - (xhr as any).readyState = 2; - abortController.abort(); - - expect(complete).toHaveBeenCalledTimes(1); - - // Shouldn't trigger additional events - (xhr as any).readyState = 4; - (xhr as any).status = 200; - xhr.onreadystatechange!({} as any); - - expect(complete).toHaveBeenCalledTimes(1); -}); - -test('errors observable if request returns with error', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const next = jest.fn(); - const complete = jest.fn(); - const error = jest.fn(); - observable.subscribe({ - next, - complete, - error, - }); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '2'; - xhr.onprogress!({} as any); - - expect(complete).toHaveBeenCalledTimes(0); - - (xhr as any).readyState = 4; - (xhr as any).status = 400; - xhr.onreadystatechange!({} as any); - - expect(complete).toHaveBeenCalledTimes(0); - expect(error).toHaveBeenCalledTimes(1); - expect(error.mock.calls[0][0]).toBeInstanceOf(Error); - expect(error.mock.calls[0][0].message).toMatchInlineSnapshot( - `"Check your network connection and try again. Code 400"` - ); -}); - -test('does not emit when gets error response', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const next = jest.fn(); - const complete = jest.fn(); - const error = jest.fn(); - observable.subscribe({ - next, - complete, - error, - }); - - (xhr as any).responseText = 'error'; - (xhr as any).status = 400; - xhr.onprogress!({} as any); - - expect(next).toHaveBeenCalledTimes(0); - - (xhr as any).readyState = 4; - xhr.onreadystatechange!({} as any); - - expect(next).toHaveBeenCalledTimes(0); - expect(error).toHaveBeenCalledTimes(1); - expect(error.mock.calls[0][0]).toBeInstanceOf(Error); - expect(error.mock.calls[0][0].message).toMatchInlineSnapshot( - `"Check your network connection and try again. Code 400"` - ); -}); - -test('when .onprogress called multiple times with same text, does not create new observable events', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const spy = jest.fn(); - observable.subscribe(spy); - - expect(spy).toHaveBeenCalledTimes(0); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '1'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '12'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '12'; - xhr.onprogress!({} as any); - - (xhr as any).responseText = '123'; - xhr.onprogress!({} as any); - - expect(spy).toHaveBeenCalledTimes(3); - expect(spy.mock.calls[0][0]).toBe('1'); - expect(spy.mock.calls[1][0]).toBe('2'); - expect(spy.mock.calls[2][0]).toBe('3'); -}); - -test('generates new observable events on .onreadystatechange', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const spy = jest.fn(); - observable.subscribe(spy); - - expect(spy).toHaveBeenCalledTimes(0); - - (xhr as any).responseText = '{"foo":"bar"}'; - xhr.onreadystatechange!({} as any); - - (xhr as any).responseText = '{"foo":"bar"}\n'; - xhr.onreadystatechange!({} as any); - - (xhr as any).responseText = '{"foo":"bar"}\n123'; - xhr.onreadystatechange!({} as any); - - expect(spy).toHaveBeenCalledTimes(3); - expect(spy.mock.calls[0][0]).toBe('{"foo":"bar"}'); - expect(spy.mock.calls[1][0]).toBe('\n'); - expect(spy.mock.calls[2][0]).toBe('123'); -}); - -test('.onreadystatechange and .onprogress can be called in any order', () => { - const xhr = createXhr(); - const observable = fromStreamingXhr(xhr); - - const spy = jest.fn(); - observable.subscribe(spy); - - expect(spy).toHaveBeenCalledTimes(0); - - (xhr as any).responseText = '{"foo":"bar"}'; - xhr.onreadystatechange!({} as any); - xhr.onprogress!({} as any); - - (xhr as any).responseText = '{"foo":"bar"}\n'; - xhr.onprogress!({} as any); - xhr.onreadystatechange!({} as any); - - (xhr as any).responseText = '{"foo":"bar"}\n123'; - xhr.onreadystatechange!({} as any); - xhr.onprogress!({} as any); - xhr.onreadystatechange!({} as any); - xhr.onprogress!({} as any); - - expect(spy).toHaveBeenCalledTimes(3); - expect(spy.mock.calls[0][0]).toBe('{"foo":"bar"}'); - expect(spy.mock.calls[1][0]).toBe('\n'); - expect(spy.mock.calls[2][0]).toBe('123'); -}); diff --git a/src/plugins/bfetch/public/streaming/from_streaming_xhr.ts b/src/plugins/bfetch/public/streaming/from_streaming_xhr.ts deleted file mode 100644 index 9242d78c9fba2..0000000000000 --- a/src/plugins/bfetch/public/streaming/from_streaming_xhr.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Observable, Subject } from 'rxjs'; -import { BfetchRequestError } from '@kbn/bfetch-error'; - -/** - * Creates observable from streaming XMLHttpRequest, where each event - * corresponds to a streamed chunk. - */ -export const fromStreamingXhr = ( - xhr: Pick< - XMLHttpRequest, - 'onprogress' | 'onreadystatechange' | 'readyState' | 'status' | 'responseText' | 'abort' - >, - signal?: AbortSignal -): Observable => { - const subject = new Subject(); - let index = 0; - let aborted = false; - - // 0 indicates a network failure. 400+ messages are considered server errors - const isErrorStatus = () => xhr.status === 0 || xhr.status >= 400; - - const processBatch = () => { - if (aborted) return; - if (isErrorStatus()) return; - - const { responseText } = xhr; - if (index >= responseText.length) return; - subject.next(responseText.substr(index)); - index = responseText.length; - }; - - xhr.onprogress = processBatch; - - const onBatchAbort = () => { - if (xhr.readyState !== 4) { - aborted = true; - xhr.abort(); - subject.complete(); - if (signal) signal.removeEventListener('abort', onBatchAbort); - } - }; - - if (signal) signal.addEventListener('abort', onBatchAbort); - - xhr.onreadystatechange = () => { - if (aborted) return; - // Older browsers don't support onprogress, so we need - // to call this here, too. It's safe to call this multiple - // times even for the same progress event. - processBatch(); - - // 4 is the magic number that means the request is done - if (xhr.readyState === 4) { - if (signal) signal.removeEventListener('abort', onBatchAbort); - - if (isErrorStatus()) { - subject.error(new BfetchRequestError(xhr.status)); - } else { - subject.complete(); - } - } - }; - - return subject; -}; diff --git a/src/plugins/bfetch/public/streaming/index.ts b/src/plugins/bfetch/public/streaming/index.ts deleted file mode 100644 index f0753584131c2..0000000000000 --- a/src/plugins/bfetch/public/streaming/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './split'; -export * from './from_streaming_xhr'; -export * from './fetch_streaming'; -export { inflateResponse } from './inflate_response'; diff --git a/src/plugins/bfetch/public/streaming/inflate_response.ts b/src/plugins/bfetch/public/streaming/inflate_response.ts deleted file mode 100644 index d374c471662ae..0000000000000 --- a/src/plugins/bfetch/public/streaming/inflate_response.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { unzlibSync, strFromU8 } from 'fflate'; -import { toByteArray } from 'base64-js'; - -export function inflateResponse(response: string) { - const buff = toByteArray(response); - const unzip = unzlibSync(buff); - return strFromU8(unzip); -} diff --git a/src/plugins/bfetch/public/streaming/split.test.ts b/src/plugins/bfetch/public/streaming/split.test.ts deleted file mode 100644 index 8b66c021a3cd9..0000000000000 --- a/src/plugins/bfetch/public/streaming/split.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { split } from './split'; -import { Subject } from 'rxjs'; - -test('splits a single IP address', () => { - const ip = '127.0.0.1'; - const list: string[] = []; - const subject = new Subject(); - const splitted = split('.')(subject); - - splitted.subscribe((value) => list.push(value)); - - subject.next(ip); - subject.complete(); - expect(list).toEqual(['127', '0', '0', '1']); -}); - -const streams = [ - 'adsf.asdf.asdf', - 'single.dot', - 'empty..split', - 'trailingdot.', - '.leadingdot', - '.', - '....', - 'no_delimiter', - '1.2.3.4.5', - '1.2.3.4.5.', - '.1.2.3.4.5.', - '.1.2.3.4.5', -]; - -for (const stream of streams) { - test(`splits stream by delimiter correctly "${stream}"`, () => { - const correctResult = stream.split('.').filter(Boolean); - - for (let j = 0; j < 100; j++) { - const list: string[] = []; - const subject = new Subject(); - const splitted = split('.')(subject); - splitted.subscribe((value) => list.push(value)); - let i = 0; - while (i < stream.length) { - const len = Math.round(Math.random() * 10); - const chunk = stream.substr(i, len); - subject.next(chunk); - i += len; - } - subject.complete(); - expect(list).toEqual(correctResult); - } - }); -} diff --git a/src/plugins/bfetch/public/streaming/split.ts b/src/plugins/bfetch/public/streaming/split.ts deleted file mode 100644 index ba35e43a87c74..0000000000000 --- a/src/plugins/bfetch/public/streaming/split.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Observable, Subject } from 'rxjs'; -import { filter } from 'rxjs'; - -/** - * Receives observable that emits strings, and returns a new observable - * that also returns strings separated by delimiter. - * - * Input stream: - * - * asdf.f -> df..aaa. -> dfsdf - * - * Output stream, assuming "." is used as delimiter: - * - * asdf -> fdf -> aaa -> dfsdf - * - */ -export const split = - (delimiter: string = '\n') => - (in$: Observable): Observable => { - const out$ = new Subject(); - let startingText = ''; - - in$.subscribe( - (chunk) => { - const messages = (startingText + chunk).split(delimiter); - - // We don't want to send the last message here, since it may or - // may not be a partial message. - messages.slice(0, -1).forEach(out$.next.bind(out$)); - startingText = messages.length ? messages[messages.length - 1] : ''; - }, - out$.error.bind(out$), - () => { - out$.next(startingText); - out$.complete(); - } - ); - - return out$.pipe(filter(Boolean)); - }; diff --git a/src/plugins/bfetch/public/test_helpers/xhr.ts b/src/plugins/bfetch/public/test_helpers/xhr.ts deleted file mode 100644 index dcc521d2c7563..0000000000000 --- a/src/plugins/bfetch/public/test_helpers/xhr.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -/* eslint-disable max-classes-per-file */ - -export const mockXMLHttpRequest = (): { - xhr: XMLHttpRequest; - XMLHttpRequest: typeof window.XMLHttpRequest; -} => { - class MockXMLHttpRequest implements XMLHttpRequest { - // @ts-expect-error upgrade typescript v5.1.6 - DONE = 0; - // @ts-expect-error upgrade typescript v5.1.6 - HEADERS_RECEIVED = 0; - // @ts-expect-error upgrade typescript v5.1.6 - LOADING = 0; - // @ts-expect-error upgrade typescript v5.1.6 - OPENED = 0; - // @ts-expect-error upgrade typescript v5.1.6 - UNSENT = 0; - abort = jest.fn(); - addEventListener = jest.fn(); - dispatchEvent = jest.fn(); - getAllResponseHeaders = jest.fn(); - getResponseHeader = jest.fn(); - onabort = jest.fn(); - onerror = jest.fn(); - onload = jest.fn(); - onloadend = jest.fn(); - onloadstart = jest.fn(); - onprogress = jest.fn(); - onreadystatechange = jest.fn(); - ontimeout = jest.fn(); - open = jest.fn(); - overrideMimeType = jest.fn(); - readyState = 0; - removeEventListener = jest.fn(); - response = null; - responseText = ''; - responseType = null as any; - responseURL = ''; - responseXML = null; - send = jest.fn(); - setRequestHeader = jest.fn(); - status = 0; - statusText = ''; - timeout = 0; - upload = null as any; - withCredentials = false; - } - - const xhr = new MockXMLHttpRequest(); - - return { - // @ts-expect-error upgrade typescript v5.1.6 - xhr, - XMLHttpRequest: class { - constructor() { - return xhr; - } - } as any, - }; -}; diff --git a/src/plugins/bfetch/server/index.ts b/src/plugins/bfetch/server/index.ts deleted file mode 100644 index 368779a4ff7c6..0000000000000 --- a/src/plugins/bfetch/server/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { PluginInitializerContext } from '@kbn/core/server'; - -export type { BfetchServerSetup, BfetchServerStart, BatchProcessingRouteParams } from './plugin'; - -export async function plugin(initializerContext: PluginInitializerContext) { - const { BfetchServerPlugin } = await import('./plugin'); - return new BfetchServerPlugin(initializerContext); -} diff --git a/src/plugins/bfetch/server/mocks.ts b/src/plugins/bfetch/server/mocks.ts deleted file mode 100644 index 0c0af0369a2b5..0000000000000 --- a/src/plugins/bfetch/server/mocks.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { coreMock } from '@kbn/core/server/mocks'; -import { BfetchServerSetup, BfetchServerStart } from '.'; -import { plugin as pluginInitializer } from '.'; - -export type Setup = jest.Mocked; -export type Start = jest.Mocked; - -const createSetupContract = (): Setup => { - const setupContract: Setup = { - addBatchProcessingRoute: jest.fn(), - addStreamingResponseRoute: jest.fn(), - }; - return setupContract; -}; - -const createStartContract = (): Start => { - const startContract: Start = {}; - - return startContract; -}; - -const createPlugin = async () => { - const pluginInitializerContext = coreMock.createPluginInitializerContext(); - const coreSetup = coreMock.createSetup(); - const coreStart = coreMock.createStart(); - const plugin = await pluginInitializer(pluginInitializerContext); - const setup = await plugin.setup(coreSetup, {}); - - return { - pluginInitializerContext, - coreSetup, - coreStart, - plugin, - setup, - doStart: async () => await plugin.start(coreStart, {}), - }; -}; - -export const bfetchPluginMock = { - createSetupContract, - createStartContract, - createPlugin, -}; diff --git a/src/plugins/bfetch/server/plugin.ts b/src/plugins/bfetch/server/plugin.ts deleted file mode 100644 index 51ff8c0505026..0000000000000 --- a/src/plugins/bfetch/server/plugin.ts +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { - CoreStart, - PluginInitializerContext, - CoreSetup, - Plugin, - Logger, - KibanaRequest, - StartServicesAccessor, - RequestHandlerContext, - RequestHandler, - KibanaResponseFactory, - AnalyticsServiceStart, - HttpProtocol, -} from '@kbn/core/server'; - -import { map$ } from '@kbn/std'; -import { schema } from '@kbn/config-schema'; -import { BFETCH_ROUTE_VERSION_LATEST } from '../common/constants'; -import { - StreamingResponseHandler, - BatchRequestData, - BatchResponseItem, - ErrorLike, - removeLeadingSlash, - normalizeError, -} from '../common'; -import { createStream } from './streaming'; -import { getUiSettings } from './ui_settings'; - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface BfetchServerSetupDependencies {} - -export interface BfetchServerStartDependencies { - analytics?: AnalyticsServiceStart; -} - -export interface BatchProcessingRouteParams { - onBatchItem: (data: BatchItemData) => Promise; -} - -/** @public */ -export interface BfetchServerSetup { - addBatchProcessingRoute: ( - path: string, - handler: (request: KibanaRequest) => BatchProcessingRouteParams - ) => void; - addStreamingResponseRoute: ( - path: string, - params: ( - request: KibanaRequest, - context: RequestHandlerContext - ) => StreamingResponseHandler, - method?: 'GET' | 'POST' | 'PUT' | 'DELETE', - pluginRouter?: ReturnType - ) => void; -} - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface BfetchServerStart {} - -const getStreamingHeaders = (protocol: HttpProtocol): Record => { - if (protocol === 'http2') { - return { - 'Content-Type': 'application/x-ndjson', - 'X-Accel-Buffering': 'no', - }; - } - return { - 'Content-Type': 'application/x-ndjson', - Connection: 'keep-alive', - 'Transfer-Encoding': 'chunked', - 'X-Accel-Buffering': 'no', - }; -}; - -interface Query { - compress: boolean; -} -export class BfetchServerPlugin - implements - Plugin< - BfetchServerSetup, - BfetchServerStart, - BfetchServerSetupDependencies, - BfetchServerStartDependencies - > -{ - private _analyticsService: AnalyticsServiceStart | undefined; - - constructor(private readonly initializerContext: PluginInitializerContext) {} - - public setup(core: CoreSetup, plugins: BfetchServerSetupDependencies): BfetchServerSetup { - const logger = this.initializerContext.logger.get(); - const router = core.http.createRouter(); - - core.uiSettings.register(getUiSettings()); - - const addStreamingResponseRoute = this.addStreamingResponseRoute({ - getStartServices: core.getStartServices, - router, - logger, - }); - const addBatchProcessingRoute = this.addBatchProcessingRoute(addStreamingResponseRoute); - - return { - addBatchProcessingRoute, - addStreamingResponseRoute, - }; - } - - public start(core: CoreStart, plugins: BfetchServerStartDependencies): BfetchServerStart { - this._analyticsService = core.analytics; - return {}; - } - - public stop() {} - - private addStreamingResponseRoute = - ({ - router, - logger, - }: { - getStartServices: StartServicesAccessor; - router: ReturnType; - logger: Logger; - }): BfetchServerSetup['addStreamingResponseRoute'] => - (path, handler, method = 'POST', pluginRouter) => { - const httpRouter = pluginRouter || router; - const routeDefinition = { - version: BFETCH_ROUTE_VERSION_LATEST, - validate: { - request: { - body: schema.any(), - query: schema.object({ compress: schema.boolean({ defaultValue: false }) }), - }, - }, - }; - - const routeHandler: RequestHandler = async ( - context: RequestHandlerContext, - request: KibanaRequest, - response: KibanaResponseFactory - ) => { - const handlerInstance = handler(request, context); - const data = request.body; - const compress = request.query.compress; - return response.ok({ - headers: getStreamingHeaders(request.protocol), - body: createStream( - handlerInstance.getResponseStream(data), - logger, - compress, - this._analyticsService - ), - }); - }; - - switch (method) { - case 'GET': - httpRouter.versioned - .get({ access: 'internal', path: `/${removeLeadingSlash(path)}` }) - .addVersion(routeDefinition, routeHandler); - break; - case 'POST': - httpRouter.versioned - .post({ access: 'internal', path: `/${removeLeadingSlash(path)}` }) - .addVersion(routeDefinition, routeHandler); - break; - case 'PUT': - httpRouter.versioned - .put({ access: 'internal', path: `/${removeLeadingSlash(path)}` }) - .addVersion(routeDefinition, routeHandler); - break; - case 'DELETE': - httpRouter.versioned - .delete({ access: 'internal', path: `/${removeLeadingSlash(path)}` }) - .addVersion(routeDefinition, routeHandler); - break; - default: - throw new Error(`Handler for method ${method} is not defined`); - } - }; - - private addBatchProcessingRoute = - ( - addStreamingResponseRoute: BfetchServerSetup['addStreamingResponseRoute'] - ): BfetchServerSetup['addBatchProcessingRoute'] => - ( - path: string, - handler: ( - request: KibanaRequest - ) => BatchProcessingRouteParams - ) => { - addStreamingResponseRoute< - BatchRequestData, - BatchResponseItem - >(path, (request) => { - const handlerInstance = handler(request); - return { - getResponseStream: ({ batch }) => - map$(batch, async (batchItem, id) => { - try { - const result = await handlerInstance.onBatchItem(batchItem); - return { id, result }; - } catch (error) { - return { id, error: normalizeError(error) }; - } - }), - }; - }); - }; -} diff --git a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts deleted file mode 100644 index 2dfc290e40bb3..0000000000000 --- a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { promisify } from 'util'; -import { Observable } from 'rxjs'; -import { catchError, concatMap, finalize } from 'rxjs'; -import { AnalyticsServiceStart, Logger } from '@kbn/core/server'; -import { Stream, PassThrough } from 'stream'; -import { constants, deflate } from 'zlib'; -import { reportPerformanceMetricEvent } from '@kbn/ebt-tools'; - -const delimiter = '\n'; -const pDeflate = promisify(deflate); - -const BFETCH_SERVER_ENCODING_EVENT_TYPE = 'bfetch_server_encoding'; - -class StreamMetricCollector { - private readonly _collector: number[] = []; - addMetric(time: number, messageSize: number) { - this._collector.push(time); - this._collector.push(messageSize); - } - getEBTPerformanceMetricEvent() { - let totalTime = 0; - let totalMessageSize = 0; - for (let i = 0; i < this._collector.length; i += 2) { - totalTime += this._collector[i]; - totalMessageSize += this._collector[i + 1]; - } - return { - eventName: BFETCH_SERVER_ENCODING_EVENT_TYPE, - duration: totalTime, - key1: 'message_count', - value1: this._collector.length / 2, - key2: 'total_byte_size', - value2: totalMessageSize, - key3: 'stream_type', - value3: 1, // 1 == 'compressed'. Can always include support for ndjson-type later (e.g. 2 == ndjson) - }; - } -} - -async function zipMessageToStream( - output: PassThrough, - message: string, - collector?: StreamMetricCollector -) { - return new Promise(async (resolve, reject) => { - try { - const before = performance.now(); - const gzipped = await pDeflate(message, { - flush: constants.Z_SYNC_FLUSH, - }); - const base64Compressed = gzipped.toString('base64'); - if (collector) { - // 1 ASCII character = 1 byte - collector.addMetric(performance.now() - before, base64Compressed.length); - } - output.write(base64Compressed); - output.write(delimiter); - resolve(undefined); - } catch (err) { - reject(err); - } - }); -} - -export const createCompressedStream = ( - results: Observable, - logger: Logger, - analyticsStart?: AnalyticsServiceStart -): Stream => { - const output = new PassThrough(); - const metricCollector: StreamMetricCollector | undefined = analyticsStart - ? new StreamMetricCollector() - : undefined; - - results - .pipe( - concatMap((message: Response) => { - const strMessage = JSON.stringify(message); - return zipMessageToStream(output, strMessage, metricCollector); - }), - catchError((e) => { - logger.error('Could not serialize or stream a message.'); - logger.error(e); - throw e; - }), - finalize(() => { - output.end(); - - if (analyticsStart && metricCollector) { - reportPerformanceMetricEvent( - analyticsStart, - metricCollector.getEBTPerformanceMetricEvent() - ); - } - }) - ) - .subscribe(); - - return output; -}; diff --git a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts b/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts deleted file mode 100644 index d287f33f2c518..0000000000000 --- a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { Observable } from 'rxjs'; -import { Logger } from '@kbn/core/server'; -import { Stream, PassThrough } from 'stream'; - -const delimiter = '\n'; - -export const createNDJSONStream = ( - results: Observable, - logger: Logger -): Stream => { - const stream = new PassThrough(); - - results.subscribe({ - next: (message: Response) => { - try { - const line = JSON.stringify(message); - stream.write(`${line}${delimiter}`); - } catch (error) { - logger.error('Could not serialize or stream a message.'); - logger.error(error); - } - }, - error: (error) => { - stream.end(); - logger.error(error); - }, - complete: () => stream.end(), - }); - - return stream; -}; diff --git a/src/plugins/bfetch/server/streaming/create_stream.ts b/src/plugins/bfetch/server/streaming/create_stream.ts deleted file mode 100644 index bbbbba701756c..0000000000000 --- a/src/plugins/bfetch/server/streaming/create_stream.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { AnalyticsServiceStart, Logger } from '@kbn/core/server'; -import { Stream } from 'stream'; -import { Observable } from 'rxjs'; -import { createCompressedStream } from './create_compressed_stream'; -import { createNDJSONStream } from './create_ndjson_stream'; - -export function createStream( - response$: Observable, - logger: Logger, - compress: boolean, - analytics?: AnalyticsServiceStart -): Stream { - return compress - ? createCompressedStream(response$, logger, analytics) - : createNDJSONStream(response$, logger); -} diff --git a/src/plugins/bfetch/server/streaming/index.ts b/src/plugins/bfetch/server/streaming/index.ts deleted file mode 100644 index 26e34b219959f..0000000000000 --- a/src/plugins/bfetch/server/streaming/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from './create_ndjson_stream'; -export * from './create_compressed_stream'; -export * from './create_stream'; diff --git a/src/plugins/bfetch/server/ui_settings.ts b/src/plugins/bfetch/server/ui_settings.ts deleted file mode 100644 index 132dd19ef8b9c..0000000000000 --- a/src/plugins/bfetch/server/ui_settings.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { i18n } from '@kbn/i18n'; -import { UiSettingsParams } from '@kbn/core/server'; -import { schema } from '@kbn/config-schema'; -import { DISABLE_BFETCH_COMPRESSION, DISABLE_BFETCH } from '../common'; - -export function getUiSettings(): Record> { - return { - [DISABLE_BFETCH]: { - name: i18n.translate('bfetch.disableBfetch', { - defaultMessage: 'Disable request batching', - }), - value: true, - description: i18n.translate('bfetch.disableBfetchDesc', { - defaultMessage: - 'Disables requests batching. This increases number of HTTP requests from Kibana, but allows to debug requests individually.', - }), - schema: schema.boolean(), - deprecation: { - message: i18n.translate('bfetch.advancedSettings.disableBfetchDeprecation', { - defaultMessage: 'This setting is deprecated and will be removed in Kibana 9.0.', - }), - docLinksKey: 'generalSettings', - }, - category: [], - requiresPageReload: true, - }, - [DISABLE_BFETCH_COMPRESSION]: { - name: i18n.translate('bfetch.disableBfetchCompression', { - defaultMessage: 'Disable batch compression', - }), - value: false, - description: i18n.translate('bfetch.disableBfetchCompressionDesc', { - defaultMessage: - 'Disable batch compression. This allows you to debug individual requests, but increases response size.', - }), - schema: schema.boolean(), - deprecation: { - message: i18n.translate('bfetch.advancedSettings.disableBfetchCompressionDeprecation', { - defaultMessage: 'This setting is deprecated and will be removed in Kibana 9.0.', - }), - docLinksKey: 'generalSettings', - }, - category: [], - requiresPageReload: true, - }, - }; -} diff --git a/src/plugins/bfetch/tsconfig.json b/src/plugins/bfetch/tsconfig.json deleted file mode 100644 index d75e6085d4537..0000000000000 --- a/src/plugins/bfetch/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "target/types", - }, - "include": ["common/**/*", "public/**/*", "server/**/*", "index.ts"], - "kbn_references": [ - "@kbn/core", - "@kbn/kibana-utils-plugin", - "@kbn/i18n", - "@kbn/config-schema", - "@kbn/std", - "@kbn/core-http-common", - "@kbn/bfetch-error", - "@kbn/ebt-tools", - "@kbn/item-buffer", - ], - "exclude": [ - "target/**/*", - ] -} diff --git a/src/plugins/data/kibana.jsonc b/src/plugins/data/kibana.jsonc index 84e692c42648a..0491e87f994e7 100644 --- a/src/plugins/data/kibana.jsonc +++ b/src/plugins/data/kibana.jsonc @@ -18,7 +18,6 @@ "browser": true, "server": true, "requiredPlugins": [ - "bfetch", "expressions", "uiActions", "share", @@ -40,4 +39,4 @@ "common" ] } -} \ No newline at end of file +} diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index 5dceb2cacac9d..c31031a5c657e 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -71,7 +71,6 @@ export class DataPublicPlugin public setup( core: CoreSetup, { - bfetch, expressions, uiActions, usageCollection, @@ -85,7 +84,6 @@ export class DataPublicPlugin setTheme(core.theme); const searchService = this.searchService.setup(core, { - bfetch, usageCollection, expressions, management, diff --git a/src/plugins/data/public/search/search_service.test.ts b/src/plugins/data/public/search/search_service.test.ts index 503a8a1d7961d..5654475263242 100644 --- a/src/plugins/data/public/search/search_service.test.ts +++ b/src/plugins/data/public/search/search_service.test.ts @@ -7,7 +7,6 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import { bfetchPluginMock } from '@kbn/bfetch-plugin/public/mocks'; import { CoreSetup, CoreStart } from '@kbn/core/public'; import { coreMock } from '@kbn/core/public/mocks'; import { DataViewsContract } from '@kbn/data-views-plugin/common'; @@ -38,10 +37,8 @@ describe('Search service', () => { describe('setup()', () => { it('exposes proper contract', async () => { - const bfetch = bfetchPluginMock.createSetupContract(); const setup = searchService.setup(mockCoreSetup, { packageInfo: { version: '8' }, - bfetch, expressions: { registerFunction: jest.fn(), registerType: jest.fn() }, management: managementPluginMock.createSetupContract(), } as unknown as SearchServiceSetupDependencies); @@ -55,10 +52,8 @@ describe('Search service', () => { describe('start()', () => { let data: ISearchStart; beforeEach(() => { - const bfetch = bfetchPluginMock.createSetupContract(); searchService.setup(mockCoreSetup, { packageInfo: { version: '8' }, - bfetch, expressions: { registerFunction: jest.fn(), registerType: jest.fn() }, management: managementPluginMock.createSetupContract(), } as unknown as SearchServiceSetupDependencies); diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts index 279e9cddc8986..d1e5d02e5d840 100644 --- a/src/plugins/data/public/search/search_service.ts +++ b/src/plugins/data/public/search/search_service.ts @@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n'; import { estypes } from '@elastic/elasticsearch'; -import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public'; import { handleWarnings } from '@kbn/search-response-warnings'; import { CoreSetup, @@ -78,7 +77,6 @@ import { ISearchSetup, ISearchStart } from './types'; /** @internal */ export interface SearchServiceSetupDependencies { - bfetch: BfetchPublicSetup; expressions: ExpressionsSetup; usageCollection?: UsageCollectionSetup; management: ManagementSetup; @@ -106,13 +104,7 @@ export class SearchService implements Plugin { public setup( core: CoreSetup, - { - bfetch, - expressions, - usageCollection, - nowProvider, - management, - }: SearchServiceSetupDependencies + { expressions, usageCollection, nowProvider, management }: SearchServiceSetupDependencies ): ISearchSetup { const { http, getStartServices, notifications, uiSettings, executionContext } = core; this.usageCollector = createUsageCollector(getStartServices, usageCollection); @@ -130,7 +122,6 @@ export class SearchService implements Plugin { * all pending search requests, as well as getting the number of pending search requests. */ this.searchInterceptor = new SearchInterceptor({ - bfetch, toasts: notifications.toasts, executionContext, http, diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts index 6cd1878ac6fb8..2191f784c9c04 100644 --- a/src/plugins/data/public/types.ts +++ b/src/plugins/data/public/types.ts @@ -7,7 +7,6 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public'; import { ExpressionsSetup } from '@kbn/expressions-plugin/public'; import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public'; import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public'; @@ -32,7 +31,6 @@ import { DataViewsContract } from './data_views'; import { NowProviderPublicContract } from './now_provider'; export interface DataSetupDependencies { - bfetch: BfetchPublicSetup; expressions: ExpressionsSetup; uiActions: UiActionsSetup; inspector: InspectorSetup; diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index b74bae5fb76e9..b8078ab264dec 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -9,7 +9,6 @@ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server'; import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server'; -import { BfetchServerSetup } from '@kbn/bfetch-plugin/server'; import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server'; @@ -47,7 +46,6 @@ export interface DataPluginStart { } export interface DataPluginSetupDependencies { - bfetch: BfetchServerSetup; expressions: ExpressionsServerSetup; usageCollection?: UsageCollectionSetup; fieldFormats: FieldFormatsSetup; @@ -94,7 +92,6 @@ export class DataServerPlugin core.uiSettings.register(getUiSettings(core.docLinks, this.config.enableUiSettingsValidations)); const searchSetup = this.searchService.setup(core, { - bfetch, expressions, usageCollection, }); diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts index 303d9a796ccca..5d26b9e3d3e78 100644 --- a/src/plugins/data/server/search/search_service.test.ts +++ b/src/plugins/data/server/search/search_service.test.ts @@ -16,7 +16,6 @@ import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mo import { createIndexPatternsStartMock } from '../data_views/mocks'; import { SearchService, SearchServiceSetupDependencies } from './search_service'; -import { bfetchPluginMock } from '@kbn/bfetch-plugin/server/mocks'; import { lastValueFrom, of } from 'rxjs'; import type { @@ -68,10 +67,8 @@ describe('Search service', () => { describe('setup()', () => { it('exposes proper contract', async () => { - const bfetch = bfetchPluginMock.createSetupContract(); const setup = plugin.setup(mockCoreSetup, { packageInfo: { version: '8' }, - bfetch, expressions: { registerFunction: jest.fn(), registerType: jest.fn(), @@ -115,7 +112,6 @@ describe('Search service', () => { mockSessionClient = createSearchSessionsClientMock(); const pluginSetup = plugin.setup(mockCoreSetup, { - bfetch: bfetchPluginMock.createSetupContract(), expressions: expressionsPluginMock.createSetupContract(), }); pluginSetup.registerSearchStrategy(ENHANCED_ES_SEARCH_STRATEGY, mockStrategy); diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts index 156336e47492d..c9fed34effe2a 100644 --- a/src/plugins/data/server/search/search_service.ts +++ b/src/plugins/data/server/search/search_service.ts @@ -28,7 +28,6 @@ import type { IEsSearchRequest, IEsSearchResponse, } from '@kbn/search-types'; -import { BfetchServerSetup } from '@kbn/bfetch-plugin/server'; import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server'; import { FieldFormatsStart } from '@kbn/field-formats-plugin/server'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; @@ -106,7 +105,6 @@ type StrategyMap = Record>; /** @internal */ export interface SearchServiceSetupDependencies { - bfetch: BfetchServerSetup; expressions: ExpressionsServerSetup; usageCollection?: UsageCollectionSetup; } @@ -145,7 +143,7 @@ export class SearchService implements Plugin { public setup( core: CoreSetup, - { bfetch, expressions, usageCollection }: SearchServiceSetupDependencies + { expressions, usageCollection }: SearchServiceSetupDependencies ): ISearchSetup { core.savedObjects.registerType(searchSessionSavedObjectType); const usage = usageCollection ? usageProvider(core) : undefined; diff --git a/src/plugins/data/tsconfig.json b/src/plugins/data/tsconfig.json index 27bf93b995381..e6d11e275f1da 100644 --- a/src/plugins/data/tsconfig.json +++ b/src/plugins/data/tsconfig.json @@ -14,7 +14,6 @@ ], "kbn_references": [ "@kbn/core", - "@kbn/bfetch-plugin", "@kbn/ui-actions-plugin", "@kbn/share-plugin", "@kbn/inspector-plugin", diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts index 779150faa89fb..7afa8c73b3809 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts @@ -412,14 +412,6 @@ export const stackManagementSchema: MakeSchemaFrom = { type: 'long', _meta: { description: 'Non-default value of setting.' }, }, - 'bfetch:disableCompression': { - type: 'boolean', - _meta: { description: 'Non-default value of setting.' }, - }, - 'bfetch:disable': { - type: 'boolean', - _meta: { description: 'Non-default value of setting.' }, - }, 'visualization:visualize:legacyHeatmapChartsLibrary': { type: 'boolean', _meta: { description: 'Non-default value of setting.' }, diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts index 2734ab6304319..1666dcd1bd5a1 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts @@ -24,8 +24,6 @@ export interface UsageStats { /** * non-sensitive settings */ - 'bfetch:disable': boolean; - 'bfetch:disableCompression': boolean; 'autocomplete:useTimeRange': boolean; 'autocomplete:valueSuggestionMethod': string; 'search:timeout': number; diff --git a/test/examples/bfetch_explorer/batched_function.ts b/test/examples/bfetch_explorer/batched_function.ts deleted file mode 100644 index 35b4123befc44..0000000000000 --- a/test/examples/bfetch_explorer/batched_function.ts +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../functional/ftr_provider_context'; - -// eslint-disable-next-line import/no-default-export -export default function ({ getService }: FtrProviderContext) { - const testSubjects = getService('testSubjects'); - - describe('batchedFunction', () => { - beforeEach(async () => { - await testSubjects.click('count-until'); - await testSubjects.click('double-integers'); - }); - - it('executes all requests in a batch', async () => { - const form = await testSubjects.find('DoubleIntegers'); - const btn = await form.findByCssSelector('button'); - await btn.click(); - await new Promise((r) => setTimeout(r, 4000)); - const pre = await form.findByCssSelector('pre'); - const text = await pre.getVisibleText(); - const json = JSON.parse(text); - - expect(json).to.eql([ - { - num: -1, - error: { - message: 'Invalid number', - }, - }, - { - num: 300, - result: { - num: 600, - }, - }, - { - num: 1000, - result: { - num: 2000, - }, - }, - { - num: 2000, - result: { - num: 4000, - }, - }, - ]); - }); - - it('streams results back', async () => { - const form = await testSubjects.find('DoubleIntegers'); - const btn = await form.findByCssSelector('button'); - await btn.click(); - - await new Promise((r) => setTimeout(r, 500)); - const pre = await form.findByCssSelector('pre'); - - const text1 = await pre.getVisibleText(); - const json1 = JSON.parse(text1); - - expect(json1.length > 0).to.be(true); - expect(json1.length < 4).to.be(true); - - await new Promise((r) => setTimeout(r, 3500)); - - const text2 = await pre.getVisibleText(); - const json2 = JSON.parse(text2); - - expect(json2.length).to.be(4); - }); - }); -} diff --git a/test/examples/bfetch_explorer/index.ts b/test/examples/bfetch_explorer/index.ts deleted file mode 100644 index 19e7cb6f0a0a4..0000000000000 --- a/test/examples/bfetch_explorer/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -import { FtrProviderContext } from '../../functional/ftr_provider_context'; - -// eslint-disable-next-line import/no-default-export -export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) { - const browser = getService('browser'); - const PageObjects = getPageObjects(['common', 'header']); - - describe('bfetch explorer', function () { - before(async () => { - await browser.setWindowSize(1300, 900); - await PageObjects.common.navigateToApp('bfetch-explorer', { insertTimestamp: false }); - }); - - loadTestFile(require.resolve('./batched_function')); - }); -} diff --git a/test/functional/apps/discover/ccs_compatibility/_timeout_results.ts b/test/functional/apps/discover/ccs_compatibility/_timeout_results.ts index 3f0ea5a4ab2e4..bac29bf5290a0 100644 --- a/test/functional/apps/discover/ccs_compatibility/_timeout_results.ts +++ b/test/functional/apps/discover/ccs_compatibility/_timeout_results.ts @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import expect from '@kbn/expect'; +import expect from '@kbn/expect/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { @@ -39,79 +39,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.uiSettings.unset('search:timeout'); }); - describe('bfetch enabled', () => { - it('timeout on single shard shows warning and results with bfetch enabled', async () => { - await common.navigateToApp('discover'); - await dataViews.createFromSearchBar({ - name: 'ftr-remote:logstash-*,logstash-*', - hasTimeField: false, - adHoc: true, - }); - - // Add a stall time to the remote indices - await filterBar.addDslFilter( - ` - { - "query": { - "error_query": { - "indices": [ - { - "name": "*:*", - "error_type": "exception", - "message": "'Watch out!'", - "stall_time_seconds": 5 - } - ] - } - } - }`, - true - ); - - // Warning callout is shown - await testSubjects.exists('searchResponseWarningsCallout'); - - // Timed out error notification is shown - const { title } = await toasts.getErrorByIndex(1, true); - expect(title).to.be('Timed out'); - - // View cluster details shows timed out - await testSubjects.click('searchResponseWarningsViewDetails'); - await testSubjects.click('viewDetailsContextMenu'); - await testSubjects.click('inspectorRequestToggleClusterDetailsftr-remote'); - const txt = await testSubjects.getVisibleText('inspectorRequestClustersDetails'); - expect(txt).to.be( - 'Request timed out before completion. Results may be incomplete or empty.' - ); - - // Ensure documents are still returned for the successful shards - await retry.try(async function tryingForTime() { - const hitCount = await discover.getHitCount(); - expect(hitCount).to.be('14,004'); - }); + it('timeout on single shard shows warning and results', async () => { + await common.navigateToApp('discover'); + await dataViews.createFromSearchBar({ + name: 'ftr-remote:logstash-*,logstash-*', + hasTimeField: false, + adHoc: true, }); - }); - describe('bfetch disabled', () => { - before(async () => { - await kibanaServer.uiSettings.update({ 'bfetch:disable': true }); - }); - - after(async () => { - await kibanaServer.uiSettings.unset('bfetch:disabled'); - }); - - it('timeout on single shard shows warning and results', async () => { - await common.navigateToApp('discover'); - await dataViews.createFromSearchBar({ - name: 'ftr-remote:logstash-*,logstash-*', - hasTimeField: false, - adHoc: true, - }); - - // Add a stall time to the remote indices - await filterBar.addDslFilter( - ` + // Add a stall time to the remote indices + await filterBar.addDslFilter( + ` { "query": { "error_query": { @@ -126,30 +64,27 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { } } }`, - true - ); + true + ); - // Warning callout is shown - await testSubjects.exists('searchResponseWarningsCallout'); + // Warning callout is shown + await testSubjects.exists('searchResponseWarningsCallout'); - // Timed out error notification is shown - const { title } = await toasts.getErrorByIndex(1, true); - expect(title).to.be('Timed out'); + // Timed out error notification is shown + const { title } = await toasts.getErrorByIndex(1, true); + expect(title).to.be('Timed out'); - // View cluster details shows timed out - await testSubjects.click('searchResponseWarningsViewDetails'); - await testSubjects.click('viewDetailsContextMenu'); - await testSubjects.click('inspectorRequestToggleClusterDetailsftr-remote'); - const txt = await testSubjects.getVisibleText('inspectorRequestClustersDetails'); - expect(txt).to.be( - 'Request timed out before completion. Results may be incomplete or empty.' - ); + // View cluster details shows timed out + await testSubjects.click('searchResponseWarningsViewDetails'); + await testSubjects.click('viewDetailsContextMenu'); + await testSubjects.click('inspectorRequestToggleClusterDetailsftr-remote'); + const txt = await testSubjects.getVisibleText('inspectorRequestClustersDetails'); + expect(txt).to.be('Request timed out before completion. Results may be incomplete or empty.'); - // Ensure documents are still returned for the successful shards - await retry.try(async function tryingForTime() { - const hitCount = await discover.getHitCount(); - expect(hitCount).to.be('14,004'); - }); + // Ensure documents are still returned for the successful shards + await retry.try(async function tryingForTime() { + const hitCount = await discover.getHitCount(); + expect(hitCount).to.be('14,004'); }); }); }); diff --git a/test/functional/apps/discover/group3/_request_counts.ts b/test/functional/apps/discover/group3/_request_counts.ts index 8a029928af0cb..e48df398db1a6 100644 --- a/test/functional/apps/discover/group3/_request_counts.ts +++ b/test/functional/apps/discover/group3/_request_counts.ts @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import expect from '@kbn/expect'; +import expect from '@kbn/expect/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { @@ -35,7 +35,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', - 'bfetch:disable': true, enableESQL: true, }); await timePicker.setDefaultAbsoluteRangeViaUiSettings(); diff --git a/test/interpreter_functional/test_suites/run_pipeline/index.ts b/test/interpreter_functional/test_suites/run_pipeline/index.ts index 5e1635d5a7117..a8060fae6e435 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/index.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/index.ts @@ -27,7 +27,6 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'Australia/North', defaultIndex: 'logstash-*', - 'bfetch:disableCompression': true, // makes it easier to debug while developing tests }); await browser.setWindowSize(1300, 900); await PageObjects.common.navigateToApp('settings'); diff --git a/test/tsconfig.json b/test/tsconfig.json index 1d8c301c44a2b..a4ddfc2f4d2a6 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -23,7 +23,6 @@ "kbn_references": [ "@kbn/core", { "path": "../src/setup_node_env/tsconfig.json" }, - "@kbn/bfetch-plugin", "@kbn/dashboard-plugin", "@kbn/expressions-plugin", "@kbn/saved-objects-management-plugin", diff --git a/tsconfig.base.json b/tsconfig.base.json index 7b1bc834fcc28..106744ce709ca 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -112,12 +112,6 @@ "@kbn/banners-plugin/*": ["x-pack/plugins/banners/*"], "@kbn/bazel-runner": ["packages/kbn-bazel-runner"], "@kbn/bazel-runner/*": ["packages/kbn-bazel-runner/*"], - "@kbn/bfetch-error": ["packages/kbn-bfetch-error"], - "@kbn/bfetch-error/*": ["packages/kbn-bfetch-error/*"], - "@kbn/bfetch-explorer-plugin": ["examples/bfetch_explorer"], - "@kbn/bfetch-explorer-plugin/*": ["examples/bfetch_explorer/*"], - "@kbn/bfetch-plugin": ["src/plugins/bfetch"], - "@kbn/bfetch-plugin/*": ["src/plugins/bfetch/*"], "@kbn/calculate-auto": ["packages/kbn-calculate-auto"], "@kbn/calculate-auto/*": ["packages/kbn-calculate-auto/*"], "@kbn/calculate-width-from-char-count": ["packages/kbn-calculate-width-from-char-count"], diff --git a/x-pack/plugins/observability_solution/synthetics/kibana.jsonc b/x-pack/plugins/observability_solution/synthetics/kibana.jsonc index 89870a9e6c881..e5680a35f9ea0 100644 --- a/x-pack/plugins/observability_solution/synthetics/kibana.jsonc +++ b/x-pack/plugins/observability_solution/synthetics/kibana.jsonc @@ -38,7 +38,6 @@ "taskManager", "triggersActionsUi", "usageCollection", - "bfetch", "uiActions", "unifiedSearch", "presentationUtil" @@ -67,4 +66,4 @@ "unifiedDocViewer" ] } -} \ No newline at end of file +} diff --git a/x-pack/plugins/observability_solution/synthetics/server/types.ts b/x-pack/plugins/observability_solution/synthetics/server/types.ts index e024721101d1f..8e0421640107e 100644 --- a/x-pack/plugins/observability_solution/synthetics/server/types.ts +++ b/x-pack/plugins/observability_solution/synthetics/server/types.ts @@ -25,7 +25,6 @@ import { SharePluginSetup } from '@kbn/share-plugin/server'; import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; import { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server'; -import { BfetchServerSetup } from '@kbn/bfetch-plugin/server'; import { CloudSetup } from '@kbn/cloud-plugin/server'; import { SpacesPluginStart } from '@kbn/spaces-plugin/server'; import { SecurityPluginStart } from '@kbn/security-plugin/server'; @@ -78,7 +77,6 @@ export interface SyntheticsPluginsSetupDependencies { encryptedSavedObjects: EncryptedSavedObjectsPluginSetup; taskManager: TaskManagerSetupContract; telemetry: TelemetryPluginSetup; - bfetch: BfetchServerSetup; share: SharePluginSetup; } diff --git a/x-pack/plugins/observability_solution/synthetics/tsconfig.json b/x-pack/plugins/observability_solution/synthetics/tsconfig.json index 5df6d4257b4e9..5657d7bc11311 100644 --- a/x-pack/plugins/observability_solution/synthetics/tsconfig.json +++ b/x-pack/plugins/observability_solution/synthetics/tsconfig.json @@ -61,7 +61,6 @@ "@kbn/core-saved-objects-api-server", "@kbn/core-saved-objects-common", "@kbn/features-plugin", - "@kbn/bfetch-plugin", "@kbn/actions-plugin", "@kbn/core-elasticsearch-server", "@kbn/core-saved-objects-api-server-mocks", diff --git a/x-pack/plugins/observability_solution/uptime/kibana.jsonc b/x-pack/plugins/observability_solution/uptime/kibana.jsonc index c4c8b8b9d76de..3f3a095cc2a65 100644 --- a/x-pack/plugins/observability_solution/uptime/kibana.jsonc +++ b/x-pack/plugins/observability_solution/uptime/kibana.jsonc @@ -38,7 +38,6 @@ "triggersActionsUi", "usageCollection", "unifiedSearch", - "bfetch" ], "optionalPlugins": [ "cloud", @@ -57,4 +56,4 @@ "observability" ] } -} \ No newline at end of file +} diff --git a/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/adapters/framework/adapter_types.ts index 9c20ff432aa7c..67fde1068fbbf 100644 --- a/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/adapters/framework/adapter_types.ts +++ b/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/adapters/framework/adapter_types.ts @@ -23,7 +23,6 @@ import { SecurityPluginStart } from '@kbn/security-plugin/server'; import { CloudSetup } from '@kbn/cloud-plugin/server'; import { SpacesPluginStart } from '@kbn/spaces-plugin/server'; import { FleetStartContract } from '@kbn/fleet-plugin/server'; -import { BfetchServerSetup } from '@kbn/bfetch-plugin/server'; import { SharePluginSetup } from '@kbn/share-plugin/server'; import { UptimeEsClient } from '../../lib'; import { UptimeConfig } from '../../../../../common/config'; @@ -59,7 +58,6 @@ export interface UptimeCorePluginsSetup { ruleRegistry: RuleRegistryPluginSetupContract; encryptedSavedObjects: EncryptedSavedObjectsPluginSetup; taskManager: TaskManagerSetupContract; - bfetch: BfetchServerSetup; share: SharePluginSetup; } diff --git a/x-pack/plugins/observability_solution/uptime/tsconfig.json b/x-pack/plugins/observability_solution/uptime/tsconfig.json index 8fa4d21627252..3b6ac59ca50df 100644 --- a/x-pack/plugins/observability_solution/uptime/tsconfig.json +++ b/x-pack/plugins/observability_solution/uptime/tsconfig.json @@ -59,7 +59,6 @@ "@kbn/features-plugin", "@kbn/rule-registry-plugin", "@kbn/security-plugin", - "@kbn/bfetch-plugin", "@kbn/alerts-as-data-utils", "@kbn/std", "@kbn/utility-types", diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index 1521e3e251702..b6a44cd959199 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -143,10 +143,6 @@ "autocomplete.seeDocumentation": "Consultez la documentation", "autocomplete.selectField": "Veuillez d'abord sélectionner un champ...", "autocomplete.showValueListModal": "Afficher la liste de valeurs", - "bfetch.disableBfetch": "Désactiver la mise en lots de requêtes", - "bfetch.disableBfetchCompression": "Désactiver la compression par lots", - "bfetch.disableBfetchCompressionDesc": "Vous pouvez désactiver la compression par lots. Cela permet de déboguer des requêtes individuelles, mais augmente la taille des réponses.", - "bfetch.disableBfetchDesc": "Désactive la mise en lot des requêtes. Cette option augmente le nombre de requêtes HTTP depuis Kibana, mais permet de les déboguer individuellement.", "bfetchError.networkError": "Vérifiez votre connexion réseau et réessayez.", "bfetchError.networkErrorWithStatus": "Vérifiez votre connexion réseau et réessayez. Code {code}", "cases.components.status.closed": "Fermé", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index e10155c086e64..58615c0daacde 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -143,10 +143,6 @@ "autocomplete.seeDocumentation": "ドキュメントを参照", "autocomplete.selectField": "最初にフィールドを選択してください...", "autocomplete.showValueListModal": "値リストを表示", - "bfetch.disableBfetch": "リクエストバッチを無効にする", - "bfetch.disableBfetchCompression": "バッチ圧縮を無効にする", - "bfetch.disableBfetchCompressionDesc": "バッチ圧縮を無効にします。個別の要求をデバッグできますが、応答サイズが大きくなります。", - "bfetch.disableBfetchDesc": "リクエストバッチを無効にします。これにより、KibanaからのHTTPリクエスト数は減りますが、個別にリクエストをデバッグできます。", "bfetchError.networkError": "ネットワーク接続を確認して再試行してください。", "bfetchError.networkErrorWithStatus": "ネットワーク接続を確認して再試行してください。コード{code}", "cases.components.status.closed": "終了", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 0ed330ec41630..865c4a12092bd 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -143,10 +143,6 @@ "autocomplete.seeDocumentation": "参阅文档", "autocomplete.selectField": "请首先选择字段......", "autocomplete.showValueListModal": "显示值列表", - "bfetch.disableBfetch": "禁用请求批处理", - "bfetch.disableBfetchCompression": "禁用批量压缩", - "bfetch.disableBfetchCompressionDesc": "禁用批量压缩。这允许您对单个请求进行故障排查，但会增加响应大小。", - "bfetch.disableBfetchDesc": "禁用请求批处理。这会增加来自 Kibana 的 HTTP 请求数，但允许对单个请求进行故障排查。", "bfetchError.networkError": "检查您的网络连接，然后重试。", "bfetchError.networkErrorWithStatus": "检查您的网络连接，然后重试。代码 {code}", "cases.components.status.closed": "已关闭", diff --git a/x-pack/test/api_integration/apis/maps/bsearch.ts b/x-pack/test/api_integration/apis/maps/bsearch.ts deleted file mode 100644 index c3161bdfdfa39..0000000000000 --- a/x-pack/test/api_integration/apis/maps/bsearch.ts +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import request from 'superagent'; -import { inflateResponse } from '@kbn/bfetch-plugin/public/streaming'; -import expect from '@kbn/expect'; -import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common'; -import { BFETCH_ROUTE_VERSION_LATEST } from '@kbn/bfetch-plugin/common'; -import type { FtrProviderContext } from '../../ftr_provider_context'; - -function parseBfetchResponse(resp: request.Response, compressed: boolean = false) { - return resp.text - .trim() - .split('\n') - .map((item) => { - return JSON.parse(compressed ? inflateResponse(item) : item); - }); -} - -export default function ({ getService }: FtrProviderContext) { - const supertest = getService('supertest'); - - // Failing: See https://github.com/elastic/kibana/issues/194716 - describe.skip('bsearch', () => { - describe('ES|QL', () => { - it(`should return getColumns response in expected shape`, async () => { - const resp = await supertest - .post(`/internal/bsearch`) - .set('kbn-xsrf', 'kibana') - .set(ELASTIC_HTTP_VERSION_HEADER, BFETCH_ROUTE_VERSION_LATEST) - .send({ - batch: [ - { - request: { - params: { - query: 'from logstash-* | keep geo.coordinates | limit 0', - }, - }, - options: { - strategy: 'esql', - }, - }, - ], - }); - - const jsonBody = parseBfetchResponse(resp); - expect(resp.status).to.be(200); - expect(jsonBody[0].result.rawResponse).to.eql({ - columns: [ - { - name: 'geo.coordinates', - type: 'geo_point', - }, - ], - values: [], - }); - }); - - it(`should return getValues response in expected shape`, async () => { - const resp = await supertest - .post(`/internal/bsearch`) - .set('kbn-xsrf', 'kibana') - .set(ELASTIC_HTTP_VERSION_HEADER, BFETCH_ROUTE_VERSION_LATEST) - .send({ - batch: [ - { - request: { - params: { - dropNullColumns: true, - query: - 'from logstash-* | keep geo.coordinates, @timestamp | sort @timestamp | limit 1', - }, - }, - options: { - strategy: 'esql', - }, - }, - ], - }); - - const jsonBody = parseBfetchResponse(resp); - expect(resp.status).to.be(200); - expect(jsonBody[0].result.rawResponse).to.eql({ - all_columns: [ - { - name: 'geo.coordinates', - type: 'geo_point', - }, - { - name: '@timestamp', - type: 'date', - }, - ], - columns: [ - { - name: 'geo.coordinates', - type: 'geo_point', - }, - { - name: '@timestamp', - type: 'date', - }, - ], - values: [['POINT (-120.9871642 38.68407028)', '2015-09-20T00:00:00.000Z']], - }); - }); - }); - }); -} diff --git a/x-pack/test/examples/search_examples/search_example.ts b/x-pack/test/examples/search_examples/search_example.ts index a46739fb6b569..fb490fe0f90f6 100644 --- a/x-pack/test/examples/search_examples/search_example.ts +++ b/x-pack/test/examples/search_examples/search_example.ts @@ -5,7 +5,7 @@ * 2.0. */ -import expect from '@kbn/expect'; +import expect from '@kbn/expect/expect'; import { FtrProviderContext } from '../../functional/ftr_provider_context'; // eslint-disable-next-line import/no-default-export @@ -17,82 +17,62 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const toasts = getService('toasts'); describe('Search example', () => { - describe('with bfetch', () => { - testSearchExample(); + const appId = 'searchExamples'; + + before(async function () { + await PageObjects.common.navigateToApp(appId, { insertTimestamp: false }); + await comboBox.setCustom('dataViewSelector', 'logstash-*'); + await comboBox.set('searchBucketField', 'geo.src'); + await comboBox.set('searchMetricField', 'memory'); + await PageObjects.timePicker.setAbsoluteRange( + 'Mar 1, 2015 @ 00:00:00.000', + 'Nov 1, 2015 @ 00:00:00.000' + ); }); - describe('no bfetch', () => { - const kibanaServer = getService('kibanaServer'); - before(async () => { - await kibanaServer.uiSettings.replace({ - 'bfetch:disable': true, - }); + beforeEach(async () => { + await toasts.dismissAll(); + await retry.waitFor('toasts gone', async () => { + return (await toasts.getCount()) === 0; }); - after(async () => { - await kibanaServer.uiSettings.unset('bfetch:disable'); - }); - - testSearchExample(); }); - const appId = 'searchExamples'; - - function testSearchExample() { - before(async function () { - await PageObjects.common.navigateToApp(appId, { insertTimestamp: false }); - await comboBox.setCustom('dataViewSelector', 'logstash-*'); - await comboBox.set('searchBucketField', 'geo.src'); - await comboBox.set('searchMetricField', 'memory'); - await PageObjects.timePicker.setAbsoluteRange( - 'Mar 1, 2015 @ 00:00:00.000', - 'Nov 1, 2015 @ 00:00:00.000' + it('should have an other bucket', async () => { + await testSubjects.click('searchSourceWithOther'); + await testSubjects.click('responseTab'); + const codeBlock = await testSubjects.find('responseCodeBlock'); + await retry.waitFor('get code block', async () => { + const visibleText = await codeBlock.getVisibleText(); + const parsedResponse = JSON.parse(visibleText); + const buckets = parsedResponse.aggregations[1].buckets; + return ( + buckets.length === 3 && buckets[2].key === '__other__' && buckets[2].doc_count === 9039 ); }); + }); - beforeEach(async () => { - await toasts.dismissAll(); - await retry.waitFor('toasts gone', async () => { - return (await toasts.getCount()) === 0; - }); - }); - - it('should have an other bucket', async () => { - await testSubjects.click('searchSourceWithOther'); - await testSubjects.click('responseTab'); - const codeBlock = await testSubjects.find('responseCodeBlock'); - await retry.waitFor('get code block', async () => { - const visibleText = await codeBlock.getVisibleText(); - const parsedResponse = JSON.parse(visibleText); - const buckets = parsedResponse.aggregations[1].buckets; - return ( - buckets.length === 3 && buckets[2].key === '__other__' && buckets[2].doc_count === 9039 - ); - }); - }); - - it('should not have an other bucket', async () => { - await testSubjects.click('searchSourceWithoutOther'); - await testSubjects.click('responseTab'); - const codeBlock = await testSubjects.find('responseCodeBlock'); - await retry.waitFor('get code block', async () => { - const visibleText = await codeBlock.getVisibleText(); - const parsedResponse = JSON.parse(visibleText); - const buckets = parsedResponse.aggregations[1].buckets; - return buckets.length === 2; - }); + it('should not have an other bucket', async () => { + await testSubjects.click('searchSourceWithoutOther'); + await testSubjects.click('responseTab'); + const codeBlock = await testSubjects.find('responseCodeBlock'); + await retry.waitFor('get code block', async () => { + const visibleText = await codeBlock.getVisibleText(); + const parsedResponse = JSON.parse(visibleText); + const buckets = parsedResponse.aggregations[1].buckets; + return buckets.length === 2; }); + }); - it('should handle warnings', async () => { - await testSubjects.click('searchWithWarning'); - await retry.waitFor('', async () => { - const toastCount = await toasts.getCount(); - return toastCount > 1; - }); - const warningToast = await toasts.getElementByIndex(2); - const textEl = await warningToast.findByTestSubject('euiToastBody'); - const text: string = await textEl.getVisibleText(); - expect(text).to.contain('Watch out!'); + it('should handle warnings', async () => { + await testSubjects.click('searchWithWarning'); + await retry.waitFor('', async () => { + const toastCount = await toasts.getCount(); + return toastCount > 1; }); - } + const warningToast = await toasts.getElementByIndex(2); + const textEl = await warningToast.findByTestSubject('euiToastBody'); + const text: string = await textEl.getVisibleText(); + expect(text).to.contain('Watch out!'); + }); }); } diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 2ba14ceb1218c..9a2f91edf8bed 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -130,7 +130,6 @@ "@kbn/telemetry-tools", "@kbn/profiling-plugin", "@kbn/observability-onboarding-plugin", - "@kbn/bfetch-plugin", "@kbn/uptime-plugin", "@kbn/ml-category-validator", "@kbn/observability-ai-assistant-plugin", diff --git a/yarn.lock b/yarn.lock index e2a1487cf91af..35eb0f7dfe538 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3480,18 +3480,6 @@ version "0.0.0" uid "" -"@kbn/bfetch-error@link:packages/kbn-bfetch-error": - version "0.0.0" - uid "" - -"@kbn/bfetch-explorer-plugin@link:examples/bfetch_explorer": - version "0.0.0" - uid "" - -"@kbn/bfetch-plugin@link:src/plugins/bfetch": - version "0.0.0" - uid "" - "@kbn/calculate-auto@link:packages/kbn-calculate-auto": version "0.0.0" uid ""