Bumped v7.11.0

Co-authored-by: István Zoltán Szabó <istvan.szabo@elastic.co>

.ci/functions/imports.sh

@@ -18,7 +18,7 @@ require_stack_version
 if [[ -z $es_node_name ]]; then
   # only set these once
   set -euo pipefail
-  export TEST_SUITE=${TEST_SUITE-oss}
+  export TEST_SUITE=${TEST_SUITE-free}
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}
@@ -27,8 +27,7 @@ if [[ -z $es_node_name ]]; then
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
   export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "xpack" ]]; then
-    export elasticsearch_image=elasticsearch-${TEST_SUITE}
+  if [[ $TEST_SUITE != "platinum" ]]; then
     export elasticsearch_url=http://${es_node_name}:9200
   fi
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}

.ci/run-elasticsearch.sh

@@ -4,16 +4,17 @@
 # to form a cluster suitable for running the REST API tests.
 #
 # Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
-# Export the TEST_SUITE variable, eg. 'oss' or 'xpack' defaults to 'oss'.
+# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.1.0
+# Version 1.2.0
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
 # - Moved to STACK_VERSION and TEST_VERSION
 # - Refactored into functions and imports
 # - Support NUMBER_OF_NODES
+# - Added 5 retries on docker pull for fixing transient network errors
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -38,7 +39,7 @@ environment=($(cat <<-END
   --env repositories.url.allowed_urls=http://snapshot.test*
 END
 ))
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
     --env ELASTIC_PASSWORD=$elastic_password
     --env xpack.license.self_generated.type=trial
@@ -63,10 +64,21 @@ END
 fi
 
 cert_validation_flags=""
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
 fi
 
+# Pull the container, retry on failures up to 5 times with
+# short delays between each attempt. Fixes most transient network errors.
+docker_pull_attempts=0
+until [ "$docker_pull_attempts" -ge 5 ]
+do
+   docker pull docker.elastic.co/elasticsearch/"$elasticsearch_container" && break
+   docker_pull_attempts=$((docker_pull_attempts+1))
+   echo "Failed to pull image, retrying in 10 seconds (retry $docker_pull_attempts/5)..."
+   sleep 10
+done
+
 NUMBER_OF_NODES=${NUMBER_OF_NODES-1}
 http_port=9200
 for (( i=0; i<$NUMBER_OF_NODES; i++, http_port++ )); do

.ci/run-repository.sh

@@ -2,7 +2,7 @@
 # parameters are available to this script
 
 # STACK_VERSION -- version e.g Major.Minor.Patch(-Prelease)
-# TEST_SUITE -- which test suite to run: oss or xpack
+# TEST_SUITE -- which test suite to run: free or platinum
 # ELASTICSEARCH_URL -- The url at which elasticsearch is reachable, a default is composed based on STACK_VERSION and TEST_SUITE
 # NODE_JS_VERSION -- node js version (defined in test-matrix.yml, a default is hardcoded here)
 script_path=$(dirname $(realpath -s $0))

.ci/test-matrix.yml

@@ -1,6 +1,6 @@
 ---
 STACK_VERSION:
-  - 7.9.0-SNAPSHOT
+  - 7.11.0-SNAPSHOT
 
 NODE_JS_VERSION:
   - 14
@@ -9,7 +9,7 @@ NODE_JS_VERSION:
   - 8
 
 TEST_SUITE:
-  - oss
-  - xpack
+  - free
+  - platinum
 
 exclude: ~

.github/workflows/nodejs.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x, 15.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
@@ -86,7 +86,7 @@ jobs:
     - name: Runs Elasticsearch
       uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 7.9.0-SNAPSHOT
+        stack-version: 7.11.0-SNAPSHOT
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1

README.md

@@ -26,9 +26,33 @@ The official Node.js client for Elasticsearch.
 npm install @elastic/elasticsearch
 ```
 
-### Compatibility
+### Node.js support
 
-The minimum supported version of Node.js is `v8`.
+NOTE: The minimum supported version of Node.js is `v8`.
+
+The client versioning follows the Elastc Stack versioning, this means that
+major, minor, and patch releases are done following a precise schedule that
+often does not coincide with the [Node.js release](https://nodejs.org/en/about/releases/) times.
+
+To avoid support insecure and unsupported versions of Node.js, the
+client **will drop the support of EOL versions of Node.js between minor releases**.
+Typically, as soon as a Node.js version goes into EOL, the client will continue
+to support that version for at least another minor release. If you are using the client
+with a version of Node.js that will be unsupported soon, you will see a warning
+in your logs (the client will start logging the warning with two minors in advance).
+
+Unless you are **always** using a supported version of Node.js, 
+we recommend defining the client dependency in your
+`package.json` with the `~` instead of `^`. In this way, you will lock the
+dependency on the minor release and not the major. (for example, `~7.10.0` instead
+of `^7.10.0`).
+
+| Node.js Version | Node.js EOL date | End of support         |
+| --------------- |------------------| ---------------------- |
+| `8.x`           | `December 2019`  | `7.11` (early 2021)    |       
+| `10.x`          | `Apri 2021`      | `7.12` (mid 2021)      |        
+
+### Compatibility
 
 The library is compatible with all Elasticsearch versions since 5.x, and you should use the same major version of the Elasticsearch instance that you are using.
 
@@ -47,7 +71,7 @@ npm install @elastic/elasticsearch@<major>
 #### Browser
 
 WARNING: There is no official support for the browser environment. It exposes your Elasticsearch instance to everyone, which could lead to security issues.
-We recommend that you write a lightweight proxy that uses this client instead.
+We recommend that you write a lightweight proxy that uses this client instead, you can see a proxy example [here](./docs/examples/proxy).
 
 ## Documentation
 

api/api/async_search.js

@@ -85,6 +85,33 @@ AsyncSearchApi.prototype.get = function asyncSearchGetApi (params, options, call
   return this.transport.request(request, options, callback)
 }
 
+AsyncSearchApi.prototype.status = function asyncSearchStatusApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['id'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: id')
+    return handleError(err, callback)
+  }
+
+  var { method, body, id, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'GET'
+  path = '/' + '_async_search' + '/' + 'status' + '/' + encodeURIComponent(id)
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: null,
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 AsyncSearchApi.prototype.submit = function asyncSearchSubmitApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 

api/api/autoscaling.js

@@ -58,7 +58,7 @@ AutoscalingApi.prototype.deleteAutoscalingPolicy = function autoscalingDeleteAut
   return this.transport.request(request, options, callback)
 }
 
-AutoscalingApi.prototype.getAutoscalingDecision = function autoscalingGetAutoscalingDecisionApi (params, options, callback) {
+AutoscalingApi.prototype.getAutoscalingCapacity = function autoscalingGetAutoscalingCapacityApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
   var { method, body, ...querystring } = params
@@ -66,7 +66,7 @@ AutoscalingApi.prototype.getAutoscalingDecision = function autoscalingGetAutosca
 
   var path = ''
   if (method == null) method = 'GET'
-  path = '/' + '_autoscaling' + '/' + 'decision'
+  path = '/' + '_autoscaling' + '/' + 'capacity'
 
   // build request object
   const request = {
@@ -139,7 +139,7 @@ AutoscalingApi.prototype.putAutoscalingPolicy = function autoscalingPutAutoscali
 
 Object.defineProperties(AutoscalingApi.prototype, {
   delete_autoscaling_policy: { get () { return this.deleteAutoscalingPolicy } },
-  get_autoscaling_decision: { get () { return this.getAutoscalingDecision } },
+  get_autoscaling_capacity: { get () { return this.getAutoscalingCapacity } },
   get_autoscaling_policy: { get () { return this.getAutoscalingPolicy } },
   put_autoscaling_policy: { get () { return this.putAutoscalingPolicy } }
 })

api/api/bulk.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['wait_for_active_shards', 'refresh', 'routing', 'timeout', 'type', '_source', '_source_excludes', '_source_exclude', '_source_includes', '_source_include', 'pipeline', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
-const snakeCase = { waitForActiveShards: 'wait_for_active_shards', _sourceExcludes: '_source_excludes', _sourceExclude: '_source_exclude', _sourceIncludes: '_source_includes', _sourceInclude: '_source_include', errorTrace: 'error_trace', filterPath: 'filter_path' }
+const acceptedQuerystring = ['wait_for_active_shards', 'refresh', 'routing', 'timeout', 'type', '_source', '_source_excludes', '_source_exclude', '_source_includes', '_source_include', 'pipeline', 'require_alias', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
+const snakeCase = { waitForActiveShards: 'wait_for_active_shards', _sourceExcludes: '_source_excludes', _sourceExclude: '_source_exclude', _sourceIncludes: '_source_includes', _sourceInclude: '_source_include', requireAlias: 'require_alias', errorTrace: 'error_trace', filterPath: 'filter_path' }
 
 function bulkApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)

api/api/cat.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['format', 'local', 'h', 'help', 's', 'v', 'expand_wildcards', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'bytes', 'master_timeout', 'fields', 'time', 'ts', 'health', 'pri', 'include_unloaded_segments', 'full_id', 'active_only', 'detailed', 'index', 'ignore_unavailable', 'node_id', 'actions', 'parent_task', 'size', 'allow_no_match', 'allow_no_datafeeds', 'allow_no_jobs', 'from']
-const snakeCase = { expandWildcards: 'expand_wildcards', errorTrace: 'error_trace', filterPath: 'filter_path', masterTimeout: 'master_timeout', includeUnloadedSegments: 'include_unloaded_segments', fullId: 'full_id', activeOnly: 'active_only', ignoreUnavailable: 'ignore_unavailable', nodeId: 'node_id', parentTask: 'parent_task', allowNoMatch: 'allow_no_match', allowNoDatafeeds: 'allow_no_datafeeds', allowNoJobs: 'allow_no_jobs' }
+const acceptedQuerystring = ['format', 'local', 'h', 'help', 's', 'v', 'expand_wildcards', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'bytes', 'master_timeout', 'fields', 'time', 'ts', 'health', 'pri', 'include_unloaded_segments', 'full_id', 'active_only', 'detailed', 'index', 'ignore_unavailable', 'nodes', 'actions', 'parent_task_id', 'size', 'allow_no_match', 'allow_no_datafeeds', 'allow_no_jobs', 'from']
+const snakeCase = { expandWildcards: 'expand_wildcards', errorTrace: 'error_trace', filterPath: 'filter_path', masterTimeout: 'master_timeout', includeUnloadedSegments: 'include_unloaded_segments', fullId: 'full_id', activeOnly: 'active_only', ignoreUnavailable: 'ignore_unavailable', parentTaskId: 'parent_task_id', allowNoMatch: 'allow_no_match', allowNoDatafeeds: 'allow_no_datafeeds', allowNoJobs: 'allow_no_jobs' }
 
 function CatApi (transport, ConfigurationError) {
   this.transport = transport

api/api/close_point_in_time.js

@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+
+const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
+const acceptedQuerystring = ['pretty', 'human', 'error_trace', 'source', 'filter_path']
+const snakeCase = { errorTrace: 'error_trace', filterPath: 'filter_path' }
+
+function closePointInTimeApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  var { method, body, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'DELETE'
+  path = '/' + '_pit'
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
+module.exports = closePointInTimeApi

api/api/index.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['wait_for_active_shards', 'op_type', 'refresh', 'routing', 'timeout', 'version', 'version_type', 'if_seq_no', 'if_primary_term', 'pipeline', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
-const snakeCase = { waitForActiveShards: 'wait_for_active_shards', opType: 'op_type', versionType: 'version_type', ifSeqNo: 'if_seq_no', ifPrimaryTerm: 'if_primary_term', errorTrace: 'error_trace', filterPath: 'filter_path' }
+const acceptedQuerystring = ['wait_for_active_shards', 'op_type', 'refresh', 'routing', 'timeout', 'version', 'version_type', 'if_seq_no', 'if_primary_term', 'pipeline', 'require_alias', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
+const snakeCase = { waitForActiveShards: 'wait_for_active_shards', opType: 'op_type', versionType: 'version_type', ifSeqNo: 'if_seq_no', ifPrimaryTerm: 'if_primary_term', requireAlias: 'require_alias', errorTrace: 'error_trace', filterPath: 'filter_path' }
 
 function indexApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)

api/api/indices.js

@@ -517,13 +517,8 @@ IndicesApi.prototype.flushSynced = function indicesFlushSyncedApi (params, optio
   querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
 
   var path = ''
-  if ((index) != null) {
-    if (method == null) method = body == null ? 'GET' : 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_flush' + '/' + 'synced'
-  } else {
-    if (method == null) method = body == null ? 'GET' : 'POST'
-    path = '/' + '_flush' + '/' + 'synced'
-  }
+  if (method == null) method = body == null ? 'GET' : 'POST'
+  path = '/' + encodeURIComponent(index) + '/' + '_flush' + '/' + 'synced'
 
   // build request object
   const request = {
@@ -782,13 +777,8 @@ IndicesApi.prototype.getUpgrade = function indicesGetUpgradeApi (params, options
   querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
 
   var path = ''
-  if ((index) != null) {
-    if (method == null) method = 'GET'
-    path = '/' + encodeURIComponent(index) + '/' + '_upgrade'
-  } else {
-    if (method == null) method = 'GET'
-    path = '/' + '_upgrade'
-  }
+  if (method == null) method = 'GET'
+  path = '/' + encodeURIComponent(index) + '/' + '_upgrade'
 
   // build request object
   const request = {
@@ -1376,13 +1366,8 @@ IndicesApi.prototype.upgrade = function indicesUpgradeApi (params, options, call
   querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
 
   var path = ''
-  if ((index) != null) {
-    if (method == null) method = 'POST'
-    path = '/' + encodeURIComponent(index) + '/' + '_upgrade'
-  } else {
-    if (method == null) method = 'POST'
-    path = '/' + '_upgrade'
-  }
+  if (method == null) method = 'POST'
+  path = '/' + encodeURIComponent(index) + '/' + '_upgrade'
 
   // build request object
   const request = {
@@ -1563,6 +1548,60 @@ IndicesApi.prototype.getDataStream = function indicesGetDataStreamApi (params, o
   return this.transport.request(request, options, callback)
 }
 
+IndicesApi.prototype.migrateToDataStream = function indicesMigrateToDataStreamApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['name'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: name')
+    return handleError(err, callback)
+  }
+
+  var { method, body, name, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + '_data_stream' + '/' + '_migrate' + '/' + encodeURIComponent(name)
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
+IndicesApi.prototype.promoteDataStream = function indicesPromoteDataStreamApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['name'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: name')
+    return handleError(err, callback)
+  }
+
+  var { method, body, name, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + '_data_stream' + '/' + '_promote' + '/' + encodeURIComponent(name)
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 IndicesApi.prototype.reloadSearchAnalyzers = function indicesReloadSearchAnalyzersApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
@@ -1650,6 +1689,8 @@ Object.defineProperties(IndicesApi.prototype, {
   data_streams_stats: { get () { return this.dataStreamsStats } },
   delete_data_stream: { get () { return this.deleteDataStream } },
   get_data_stream: { get () { return this.getDataStream } },
+  migrate_to_data_stream: { get () { return this.migrateToDataStream } },
+  promote_data_stream: { get () { return this.promoteDataStream } },
   reload_search_analyzers: { get () { return this.reloadSearchAnalyzers } }
 })
 

api/api/ml.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['allow_no_jobs', 'force', 'timeout', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'requests_per_second', 'allow_no_forecasts', 'wait_for_completion', 'lines_to_sample', 'line_merge_size_limit', 'charset', 'format', 'has_header_row', 'column_names', 'delimiter', 'quote', 'should_trim_fields', 'grok_pattern', 'timestamp_field', 'timestamp_format', 'explain', 'calc_interim', 'start', 'end', 'advance_time', 'skip_time', 'duration', 'expires_in', 'max_model_memory', 'expand', 'exclude_interim', 'from', 'size', 'anomaly_score', 'sort', 'desc', 'job_id', 'partition_field_value', 'allow_no_match', 'allow_no_datafeeds', 'influencer_score', 'top_n', 'bucket_span', 'overall_score', 'record_score', 'include_model_definition', 'decompress_definition', 'tags', 'for_export', 'reset_start', 'reset_end', 'ignore_unavailable', 'allow_no_indices', 'ignore_throttled', 'expand_wildcards', 'delete_intervening_results', 'enabled']
-const snakeCase = { allowNoJobs: 'allow_no_jobs', errorTrace: 'error_trace', filterPath: 'filter_path', requestsPerSecond: 'requests_per_second', allowNoForecasts: 'allow_no_forecasts', waitForCompletion: 'wait_for_completion', linesToSample: 'lines_to_sample', lineMergeSizeLimit: 'line_merge_size_limit', hasHeaderRow: 'has_header_row', columnNames: 'column_names', shouldTrimFields: 'should_trim_fields', grokPattern: 'grok_pattern', timestampField: 'timestamp_field', timestampFormat: 'timestamp_format', calcInterim: 'calc_interim', advanceTime: 'advance_time', skipTime: 'skip_time', expiresIn: 'expires_in', maxModelMemory: 'max_model_memory', excludeInterim: 'exclude_interim', anomalyScore: 'anomaly_score', jobId: 'job_id', partitionFieldValue: 'partition_field_value', allowNoMatch: 'allow_no_match', allowNoDatafeeds: 'allow_no_datafeeds', influencerScore: 'influencer_score', topN: 'top_n', bucketSpan: 'bucket_span', overallScore: 'overall_score', recordScore: 'record_score', includeModelDefinition: 'include_model_definition', decompressDefinition: 'decompress_definition', forExport: 'for_export', resetStart: 'reset_start', resetEnd: 'reset_end', ignoreUnavailable: 'ignore_unavailable', allowNoIndices: 'allow_no_indices', ignoreThrottled: 'ignore_throttled', expandWildcards: 'expand_wildcards', deleteInterveningResults: 'delete_intervening_results' }
+const acceptedQuerystring = ['allow_no_match', 'allow_no_jobs', 'force', 'timeout', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'requests_per_second', 'allow_no_forecasts', 'wait_for_completion', 'lines_to_sample', 'line_merge_size_limit', 'charset', 'format', 'has_header_row', 'column_names', 'delimiter', 'quote', 'should_trim_fields', 'grok_pattern', 'timestamp_field', 'timestamp_format', 'explain', 'calc_interim', 'start', 'end', 'advance_time', 'skip_time', 'duration', 'expires_in', 'max_model_memory', 'expand', 'exclude_interim', 'from', 'size', 'anomaly_score', 'sort', 'desc', 'job_id', 'partition_field_value', 'exclude_generated', 'verbose', 'allow_no_datafeeds', 'influencer_score', 'top_n', 'bucket_span', 'overall_score', 'record_score', 'include', 'include_model_definition', 'decompress_definition', 'tags', 'reset_start', 'reset_end', 'ignore_unavailable', 'allow_no_indices', 'ignore_throttled', 'expand_wildcards', 'delete_intervening_results', 'enabled']
+const snakeCase = { allowNoMatch: 'allow_no_match', allowNoJobs: 'allow_no_jobs', errorTrace: 'error_trace', filterPath: 'filter_path', requestsPerSecond: 'requests_per_second', allowNoForecasts: 'allow_no_forecasts', waitForCompletion: 'wait_for_completion', linesToSample: 'lines_to_sample', lineMergeSizeLimit: 'line_merge_size_limit', hasHeaderRow: 'has_header_row', columnNames: 'column_names', shouldTrimFields: 'should_trim_fields', grokPattern: 'grok_pattern', timestampField: 'timestamp_field', timestampFormat: 'timestamp_format', calcInterim: 'calc_interim', advanceTime: 'advance_time', skipTime: 'skip_time', expiresIn: 'expires_in', maxModelMemory: 'max_model_memory', excludeInterim: 'exclude_interim', anomalyScore: 'anomaly_score', jobId: 'job_id', partitionFieldValue: 'partition_field_value', excludeGenerated: 'exclude_generated', allowNoDatafeeds: 'allow_no_datafeeds', influencerScore: 'influencer_score', topN: 'top_n', bucketSpan: 'bucket_span', overallScore: 'overall_score', recordScore: 'record_score', includeModelDefinition: 'include_model_definition', decompressDefinition: 'decompress_definition', resetStart: 'reset_start', resetEnd: 'reset_end', ignoreUnavailable: 'ignore_unavailable', allowNoIndices: 'allow_no_indices', ignoreThrottled: 'ignore_throttled', expandWildcards: 'expand_wildcards', deleteInterveningResults: 'delete_intervening_results' }
 
 function MlApi (transport, ConfigurationError) {
   this.transport = transport
@@ -382,7 +382,7 @@ MlApi.prototype.deleteTrainedModel = function mlDeleteTrainedModelApi (params, o
 
   var path = ''
   if (method == null) method = 'DELETE'
-  path = '/' + '_ml' + '/' + 'inference' + '/' + encodeURIComponent(model_id || modelId)
+  path = '/' + '_ml' + '/' + 'trained_models' + '/' + encodeURIComponent(model_id || modelId)
 
   // build request object
   const request = {
@@ -995,10 +995,10 @@ MlApi.prototype.getTrainedModels = function mlGetTrainedModelsApi (params, optio
   var path = ''
   if ((model_id || modelId) != null) {
     if (method == null) method = 'GET'
-    path = '/' + '_ml' + '/' + 'inference' + '/' + encodeURIComponent(model_id || modelId)
+    path = '/' + '_ml' + '/' + 'trained_models' + '/' + encodeURIComponent(model_id || modelId)
   } else {
     if (method == null) method = 'GET'
-    path = '/' + '_ml' + '/' + 'inference'
+    path = '/' + '_ml' + '/' + 'trained_models'
   }
 
   // build request object
@@ -1021,10 +1021,10 @@ MlApi.prototype.getTrainedModelsStats = function mlGetTrainedModelsStatsApi (par
   var path = ''
   if ((model_id || modelId) != null) {
     if (method == null) method = 'GET'
-    path = '/' + '_ml' + '/' + 'inference' + '/' + encodeURIComponent(model_id || modelId) + '/' + '_stats'
+    path = '/' + '_ml' + '/' + 'trained_models' + '/' + encodeURIComponent(model_id || modelId) + '/' + '_stats'
   } else {
     if (method == null) method = 'GET'
-    path = '/' + '_ml' + '/' + 'inference' + '/' + '_stats'
+    path = '/' + '_ml' + '/' + 'trained_models' + '/' + '_stats'
   }
 
   // build request object
@@ -1381,7 +1381,7 @@ MlApi.prototype.putTrainedModel = function mlPutTrainedModelApi (params, options
 
   var path = ''
   if (method == null) method = 'PUT'
-  path = '/' + '_ml' + '/' + 'inference' + '/' + encodeURIComponent(model_id || modelId)
+  path = '/' + '_ml' + '/' + 'trained_models' + '/' + encodeURIComponent(model_id || modelId)
 
   // build request object
   const request = {
@@ -1725,6 +1725,43 @@ MlApi.prototype.updateModelSnapshot = function mlUpdateModelSnapshotApi (params,
   return this.transport.request(request, options, callback)
 }
 
+MlApi.prototype.upgradeJobSnapshot = function mlUpgradeJobSnapshotApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['job_id'] == null && params['jobId'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: job_id or jobId')
+    return handleError(err, callback)
+  }
+  if (params['snapshot_id'] == null && params['snapshotId'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: snapshot_id or snapshotId')
+    return handleError(err, callback)
+  }
+
+  // check required url components
+  if ((params['snapshot_id'] != null || params['snapshotId'] != null) && ((params['job_id'] == null && params['jobId'] == null))) {
+    const err = new this[kConfigurationError]('Missing required parameter of the url: job_id')
+    return handleError(err, callback)
+  }
+
+  var { method, body, jobId, job_id, snapshotId, snapshot_id, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + '_ml' + '/' + 'anomaly_detectors' + '/' + encodeURIComponent(job_id || jobId) + '/' + 'model_snapshots' + '/' + encodeURIComponent(snapshot_id || snapshotId) + '/' + '_upgrade'
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 MlApi.prototype.validate = function mlValidateApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
@@ -1836,6 +1873,7 @@ Object.defineProperties(MlApi.prototype, {
   update_filter: { get () { return this.updateFilter } },
   update_job: { get () { return this.updateJob } },
   update_model_snapshot: { get () { return this.updateModelSnapshot } },
+  upgrade_job_snapshot: { get () { return this.upgradeJobSnapshot } },
   validate_detector: { get () { return this.validateDetector } }
 })
 

api/api/open_point_in_time.js

@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+/* eslint camelcase: 0 */
+/* eslint no-unused-vars: 0 */
+
+const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
+const acceptedQuerystring = ['preference', 'routing', 'ignore_unavailable', 'expand_wildcards', 'keep_alive', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
+const snakeCase = { ignoreUnavailable: 'ignore_unavailable', expandWildcards: 'expand_wildcards', keepAlive: 'keep_alive', errorTrace: 'error_trace', filterPath: 'filter_path' }
+
+function openPointInTimeApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  var { method, body, index, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if ((index) != null) {
+    if (method == null) method = 'POST'
+    path = '/' + encodeURIComponent(index) + '/' + '_pit'
+  } else {
+    if (method == null) method = 'POST'
+    path = '/' + '_pit'
+  }
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
+module.exports = openPointInTimeApi

api/api/rollup.js

@@ -168,6 +168,47 @@ RollupApi.prototype.putJob = function rollupPutJobApi (params, options, callback
   return this.transport.request(request, options, callback)
 }
 
+RollupApi.prototype.rollup = function rollupRollupApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['index'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: index')
+    return handleError(err, callback)
+  }
+  if (params['rollup_index'] == null && params['rollupIndex'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: rollup_index or rollupIndex')
+    return handleError(err, callback)
+  }
+  if (params['body'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: body')
+    return handleError(err, callback)
+  }
+
+  // check required url components
+  if ((params['rollup_index'] != null || params['rollupIndex'] != null) && (params['index'] == null)) {
+    const err = new this[kConfigurationError]('Missing required parameter of the url: index')
+    return handleError(err, callback)
+  }
+
+  var { method, body, index, rollupIndex, rollup_index, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + encodeURIComponent(index) + '/' + '_rollup' + '/' + encodeURIComponent(rollup_index || rollupIndex)
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 RollupApi.prototype.rollupSearch = function rollupRollupSearchApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 

api/api/security.js

@@ -84,6 +84,33 @@ SecurityApi.prototype.changePassword = function securityChangePasswordApi (param
   return this.transport.request(request, options, callback)
 }
 
+SecurityApi.prototype.clearApiKeyCache = function securityClearApiKeyCacheApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['ids'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: ids')
+    return handleError(err, callback)
+  }
+
+  var { method, body, ids, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + '_security' + '/' + 'api_key' + '/' + encodeURIComponent(ids) + '/' + '_clear_cache'
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 SecurityApi.prototype.clearCachedPrivileges = function securityClearCachedPrivilegesApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
@@ -567,6 +594,33 @@ SecurityApi.prototype.getUserPrivileges = function securityGetUserPrivilegesApi
   return this.transport.request(request, options, callback)
 }
 
+SecurityApi.prototype.grantApiKey = function securityGrantApiKeyApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['body'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: body')
+    return handleError(err, callback)
+  }
+
+  var { method, body, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'POST'
+  path = '/' + '_security' + '/' + 'api_key' + '/' + 'grant'
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 SecurityApi.prototype.hasPrivileges = function securityHasPrivilegesApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
@@ -775,6 +829,7 @@ SecurityApi.prototype.putUser = function securityPutUserApi (params, options, ca
 
 Object.defineProperties(SecurityApi.prototype, {
   change_password: { get () { return this.changePassword } },
+  clear_api_key_cache: { get () { return this.clearApiKeyCache } },
   clear_cached_privileges: { get () { return this.clearCachedPrivileges } },
   clear_cached_realms: { get () { return this.clearCachedRealms } },
   clear_cached_roles: { get () { return this.clearCachedRoles } },
@@ -793,6 +848,7 @@ Object.defineProperties(SecurityApi.prototype, {
   get_token: { get () { return this.getToken } },
   get_user: { get () { return this.getUser } },
   get_user_privileges: { get () { return this.getUserPrivileges } },
+  grant_api_key: { get () { return this.grantApiKey } },
   has_privileges: { get () { return this.hasPrivileges } },
   invalidate_api_key: { get () { return this.invalidateApiKey } },
   invalidate_token: { get () { return this.invalidateToken } },

api/api/snapshot.js

@@ -58,6 +58,54 @@ SnapshotApi.prototype.cleanupRepository = function snapshotCleanupRepositoryApi
   return this.transport.request(request, options, callback)
 }
 
+SnapshotApi.prototype.clone = function snapshotCloneApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  // check required parameters
+  if (params['repository'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: repository')
+    return handleError(err, callback)
+  }
+  if (params['snapshot'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: snapshot')
+    return handleError(err, callback)
+  }
+  if (params['target_snapshot'] == null && params['targetSnapshot'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: target_snapshot or targetSnapshot')
+    return handleError(err, callback)
+  }
+  if (params['body'] == null) {
+    const err = new this[kConfigurationError]('Missing required parameter: body')
+    return handleError(err, callback)
+  }
+
+  // check required url components
+  if ((params['target_snapshot'] != null || params['targetSnapshot'] != null) && (params['snapshot'] == null || params['repository'] == null)) {
+    const err = new this[kConfigurationError]('Missing required parameter of the url: snapshot, repository')
+    return handleError(err, callback)
+  } else if (params['snapshot'] != null && (params['repository'] == null)) {
+    const err = new this[kConfigurationError]('Missing required parameter of the url: repository')
+    return handleError(err, callback)
+  }
+
+  var { method, body, repository, snapshot, targetSnapshot, target_snapshot, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = 'PUT'
+  path = '/' + '_snapshot' + '/' + encodeURIComponent(repository) + '/' + encodeURIComponent(snapshot) + '/' + '_clone' + '/' + encodeURIComponent(target_snapshot || targetSnapshot)
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 SnapshotApi.prototype.create = function snapshotCreateApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 

api/api/transform.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['force', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'from', 'size', 'allow_no_match', 'defer_validation', 'timeout', 'wait_for_completion', 'wait_for_checkpoint']
-const snakeCase = { errorTrace: 'error_trace', filterPath: 'filter_path', allowNoMatch: 'allow_no_match', deferValidation: 'defer_validation', waitForCompletion: 'wait_for_completion', waitForCheckpoint: 'wait_for_checkpoint' }
+const acceptedQuerystring = ['force', 'pretty', 'human', 'error_trace', 'source', 'filter_path', 'from', 'size', 'allow_no_match', 'exclude_generated', 'defer_validation', 'timeout', 'wait_for_completion', 'wait_for_checkpoint']
+const snakeCase = { errorTrace: 'error_trace', filterPath: 'filter_path', allowNoMatch: 'allow_no_match', excludeGenerated: 'exclude_generated', deferValidation: 'defer_validation', waitForCompletion: 'wait_for_completion', waitForCheckpoint: 'wait_for_checkpoint' }
 
 function TransformApi (transport, ConfigurationError) {
   this.transport = transport

api/api/update.js

@@ -23,8 +23,8 @@
 /* eslint no-unused-vars: 0 */
 
 const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
-const acceptedQuerystring = ['wait_for_active_shards', '_source', '_source_excludes', '_source_exclude', '_source_includes', '_source_include', 'lang', 'refresh', 'retry_on_conflict', 'routing', 'timeout', 'if_seq_no', 'if_primary_term', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
-const snakeCase = { waitForActiveShards: 'wait_for_active_shards', _sourceExcludes: '_source_excludes', _sourceExclude: '_source_exclude', _sourceIncludes: '_source_includes', _sourceInclude: '_source_include', retryOnConflict: 'retry_on_conflict', ifSeqNo: 'if_seq_no', ifPrimaryTerm: 'if_primary_term', errorTrace: 'error_trace', filterPath: 'filter_path' }
+const acceptedQuerystring = ['wait_for_active_shards', '_source', '_source_excludes', '_source_exclude', '_source_includes', '_source_include', 'lang', 'refresh', 'retry_on_conflict', 'routing', 'timeout', 'if_seq_no', 'if_primary_term', 'require_alias', 'pretty', 'human', 'error_trace', 'source', 'filter_path']
+const snakeCase = { waitForActiveShards: 'wait_for_active_shards', _sourceExcludes: '_source_excludes', _sourceExclude: '_source_exclude', _sourceIncludes: '_source_includes', _sourceInclude: '_source_include', retryOnConflict: 'retry_on_conflict', ifSeqNo: 'if_seq_no', ifPrimaryTerm: 'if_primary_term', requireAlias: 'require_alias', errorTrace: 'error_trace', filterPath: 'filter_path' }
 
 function updateApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)

api/api/watcher.js

@@ -230,6 +230,27 @@ WatcherApi.prototype.putWatch = function watcherPutWatchApi (params, options, ca
   return this.transport.request(request, options, callback)
 }
 
+WatcherApi.prototype.queryWatches = function watcherQueryWatchesApi (params, options, callback) {
+  ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+  var { method, body, ...querystring } = params
+  querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+  var path = ''
+  if (method == null) method = body == null ? 'GET' : 'POST'
+  path = '/' + '_watcher' + '/' + '_query' + '/' + 'watches'
+
+  // build request object
+  const request = {
+    method,
+    path,
+    body: body || '',
+    querystring
+  }
+
+  return this.transport.request(request, options, callback)
+}
+
 WatcherApi.prototype.start = function watcherStartApi (params, options, callback) {
   ;[params, options, callback] = normalizeArguments(params, options, callback)
 
@@ -305,7 +326,8 @@ Object.defineProperties(WatcherApi.prototype, {
   delete_watch: { get () { return this.deleteWatch } },
   execute_watch: { get () { return this.executeWatch } },
   get_watch: { get () { return this.getWatch } },
-  put_watch: { get () { return this.putWatch } }
+  put_watch: { get () { return this.putWatch } },
+  query_watches: { get () { return this.queryWatches } }
 })
 
 module.exports = WatcherApi

api/index.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -53,6 +68,7 @@ const updateByQueryRethrottleApi = require('./api/update_by_query_rethrottle')
 const AsyncSearchApi = require('./api/async_search')
 const AutoscalingApi = require('./api/autoscaling')
 const CcrApi = require('./api/ccr')
+const closePointInTimeApi = require('./api/close_point_in_time')
 const EnrichApi = require('./api/enrich')
 const EqlApi = require('./api/eql')
 const GraphApi = require('./api/graph')
@@ -61,6 +77,7 @@ const LicenseApi = require('./api/license')
 const MigrationApi = require('./api/migration')
 const MlApi = require('./api/ml')
 const MonitoringApi = require('./api/monitoring')
+const openPointInTimeApi = require('./api/open_point_in_time')
 const RollupApi = require('./api/rollup')
 const SearchableSnapshotsApi = require('./api/searchable_snapshots')
 const SecurityApi = require('./api/security')
@@ -171,6 +188,8 @@ ESAPI.prototype.termvectors = termvectorsApi
 ESAPI.prototype.update = updateApi
 ESAPI.prototype.updateByQuery = updateByQueryApi
 ESAPI.prototype.updateByQueryRethrottle = updateByQueryRethrottleApi
+ESAPI.prototype.closePointInTime = closePointInTimeApi
+ESAPI.prototype.openPointInTime = openPointInTimeApi
 
 Object.defineProperties(ESAPI.prototype, {
   cat: {
@@ -283,6 +302,7 @@ Object.defineProperties(ESAPI.prototype, {
       return this[kCcr]
     }
   },
+  close_point_in_time: { get () { return this.closePointInTime } },
   enrich: {
     get () {
       if (this[kEnrich] === null) {
@@ -347,6 +367,7 @@ Object.defineProperties(ESAPI.prototype, {
       return this[kMonitoring]
     }
   },
+  open_point_in_time: { get () { return this.openPointInTime } },
   rollup: {
     get () {
       if (this[kRollup] === null) {

api/kibana.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /// <reference types="node" />
 
@@ -63,11 +78,12 @@ interface KibanaClient {
   asyncSearch: {
     delete<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchDelete, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     get<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchGet, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    status<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchStatus, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchSubmit<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   }
   autoscaling: {
     deleteAutoscalingPolicy<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingDeleteAutoscalingPolicy, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    getAutoscalingDecision<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingDecision, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    getAutoscalingCapacity<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingCapacity, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getAutoscalingPolicy<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingPolicy, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putAutoscalingPolicy<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingPutAutoscalingPolicy<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   }
@@ -115,6 +131,7 @@ interface KibanaClient {
     unfollow<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.CcrUnfollow, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   }
   clearScroll<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClearScroll<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+  closePointInTime<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClosePointInTime<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   cluster: {
     allocationExplain<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClusterAllocationExplain<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     deleteComponentTemplate<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.ClusterDeleteComponentTemplate, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -212,7 +229,9 @@ interface KibanaClient {
     getSettings<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesGetSettings, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getTemplate<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesGetTemplate, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getUpgrade<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesGetUpgrade, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    migrateToDataStream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesMigrateToDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     open<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesOpen, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    promoteDataStream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPromoteDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putAlias<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPutAlias<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putIndexTemplate<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPutIndexTemplate<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putMapping<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPutMapping<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -309,12 +328,13 @@ interface KibanaClient {
     startDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStartDataFrameAnalytics<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     startDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStartDatafeed<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     stopDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDataFrameAnalytics<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    stopDatafeed<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    stopDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     updateDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateDataFrameAnalytics<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     updateDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateDatafeed<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     updateFilter<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateFilter<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     updateJob<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateJob<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     updateModelSnapshot<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateModelSnapshot<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    upgradeJobSnapshot<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpgradeJobSnapshot, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     validate<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlValidate<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     validateDetector<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlValidateDetector<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   }
@@ -331,6 +351,7 @@ interface KibanaClient {
     stats<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.NodesStats, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     usage<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.NodesUsage, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   }
+  openPointInTime<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.OpenPointInTime, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   ping<TResponse = boolean, TContext = Context>(params?: RequestParams.Ping, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   putScript<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.PutScript<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   rankEval<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RankEval<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -343,6 +364,7 @@ interface KibanaClient {
     getRollupCaps<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.RollupGetRollupCaps, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getRollupIndexCaps<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.RollupGetRollupIndexCaps, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putJob<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RollupPutJob<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    rollup<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RollupRollup<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     rollupSearch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RollupRollupSearch<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     startJob<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.RollupStartJob, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     stopJob<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.RollupStopJob, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -361,6 +383,7 @@ interface KibanaClient {
   security: {
     authenticate<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityAuthenticate, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     changePassword<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityChangePassword<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    clearApiKeyCache<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearApiKeyCache, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     clearCachedPrivileges<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearCachedPrivileges, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     clearCachedRealms<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearCachedRealms, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     clearCachedRoles<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearCachedRoles, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -379,6 +402,7 @@ interface KibanaClient {
     getToken<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGetToken<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getUser<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGetUser, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getUserPrivileges<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGetUserPrivileges, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    grantApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGrantApiKey<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     hasPrivileges<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityHasPrivileges<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     invalidateApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityInvalidateApiKey<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     invalidateToken<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityInvalidateToken<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -400,6 +424,7 @@ interface KibanaClient {
   }
   snapshot: {
     cleanupRepository<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotCleanupRepository, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    clone<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotClone<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     create<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotCreate<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     createRepository<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotCreateRepository<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     delete<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotDelete, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
@@ -445,6 +470,7 @@ interface KibanaClient {
     executeWatch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherExecuteWatch<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     getWatch<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherGetWatch, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     putWatch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherPutWatch<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    queryWatches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherQueryWatches<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     start<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherStart, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     stats<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherStats, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     stop<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherStop, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>

api/requestParams.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { RequestBody, RequestNDBody } from '../lib/Transport'
 
@@ -24,6 +39,10 @@ export interface AsyncSearchGet extends Generic {
   typed_keys?: boolean;
 }
 
+export interface AsyncSearchStatus extends Generic {
+  id: string;
+}
+
 export interface AsyncSearchSubmit<T = RequestBody> extends Generic {
   index?: string | string[];
   _source_exclude?: string | string[];
@@ -76,7 +95,7 @@ export interface AutoscalingDeleteAutoscalingPolicy extends Generic {
   name: string;
 }
 
-export interface AutoscalingGetAutoscalingDecision extends Generic {
+export interface AutoscalingGetAutoscalingCapacity extends Generic {
 }
 
 export interface AutoscalingGetAutoscalingPolicy extends Generic {
@@ -101,6 +120,7 @@ export interface Bulk<T = RequestNDBody> extends Generic {
   _source_excludes?: string | string[];
   _source_includes?: string | string[];
   pipeline?: string;
+  require_alias?: boolean;
   body: T;
 }
 
@@ -202,6 +222,7 @@ export interface CatMlDataFrameAnalytics extends Generic {
 
 export interface CatMlDatafeeds extends Generic {
   datafeed_id?: string;
+  allow_no_match?: boolean;
   allow_no_datafeeds?: boolean;
   format?: string;
   h?: string | string[];
@@ -213,6 +234,7 @@ export interface CatMlDatafeeds extends Generic {
 
 export interface CatMlJobs extends Generic {
   job_id?: string;
+  allow_no_match?: boolean;
   allow_no_jobs?: boolean;
   bytes?: 'b' | 'k' | 'kb' | 'm' | 'mb' | 'g' | 'gb' | 't' | 'tb' | 'p' | 'pb';
   format?: string;
@@ -341,10 +363,10 @@ export interface CatSnapshots extends Generic {
 
 export interface CatTasks extends Generic {
   format?: string;
-  node_id?: string | string[];
+  nodes?: string | string[];
   actions?: string | string[];
   detailed?: boolean;
-  parent_task?: number;
+  parent_task_id?: string;
   h?: string | string[];
   help?: boolean;
   s?: string | string[];
@@ -449,6 +471,10 @@ export interface ClearScroll<T = RequestBody> extends Generic {
   body?: T;
 }
 
+export interface ClosePointInTime<T = RequestBody> extends Generic {
+  body?: T;
+}
+
 export interface ClusterAllocationExplain<T = RequestBody> extends Generic {
   include_yes_decisions?: boolean;
   include_disk_info?: boolean;
@@ -888,6 +914,7 @@ export interface Index<T = RequestBody> extends Generic {
   if_seq_no?: number;
   if_primary_term?: number;
   pipeline?: string;
+  require_alias?: boolean;
   body: T;
 }
 
@@ -971,6 +998,7 @@ export interface IndicesDeleteAlias extends Generic {
 
 export interface IndicesDeleteDataStream extends Generic {
   name: string | string[];
+  expand_wildcards?: 'open' | 'closed' | 'hidden' | 'none' | 'all';
 }
 
 export interface IndicesDeleteIndexTemplate extends Generic {
@@ -1086,6 +1114,7 @@ export interface IndicesGetAlias extends Generic {
 
 export interface IndicesGetDataStream extends Generic {
   name?: string | string[];
+  expand_wildcards?: 'open' | 'closed' | 'hidden' | 'none' | 'all';
 }
 
 export interface IndicesGetFieldMapping extends Generic {
@@ -1145,6 +1174,10 @@ export interface IndicesGetUpgrade extends Generic {
   expand_wildcards?: 'open' | 'closed' | 'hidden' | 'none' | 'all';
 }
 
+export interface IndicesMigrateToDataStream extends Generic {
+  name: string;
+}
+
 export interface IndicesOpen extends Generic {
   index: string | string[];
   timeout?: string;
@@ -1155,6 +1188,10 @@ export interface IndicesOpen extends Generic {
   wait_for_active_shards?: string;
 }
 
+export interface IndicesPromoteDataStream extends Generic {
+  name: string;
+}
+
 export interface IndicesPutAlias<T = RequestBody> extends Generic {
   index: string | string[];
   name: string;
@@ -1431,6 +1468,7 @@ export interface MigrationDeprecations extends Generic {
 
 export interface MlCloseJob<T = RequestBody> extends Generic {
   job_id: string;
+  allow_no_match?: boolean;
   allow_no_jobs?: boolean;
   force?: boolean;
   timeout?: string;
@@ -1588,6 +1626,7 @@ export interface MlGetDataFrameAnalytics extends Generic {
   allow_no_match?: boolean;
   from?: number;
   size?: number;
+  exclude_generated?: boolean;
 }
 
 export interface MlGetDataFrameAnalyticsStats extends Generic {
@@ -1595,16 +1634,20 @@ export interface MlGetDataFrameAnalyticsStats extends Generic {
   allow_no_match?: boolean;
   from?: number;
   size?: number;
+  verbose?: boolean;
 }
 
 export interface MlGetDatafeedStats extends Generic {
   datafeed_id?: string;
+  allow_no_match?: boolean;
   allow_no_datafeeds?: boolean;
 }
 
 export interface MlGetDatafeeds extends Generic {
   datafeed_id?: string;
+  allow_no_match?: boolean;
   allow_no_datafeeds?: boolean;
+  exclude_generated?: boolean;
 }
 
 export interface MlGetFilters extends Generic {
@@ -1628,12 +1671,15 @@ export interface MlGetInfluencers<T = RequestBody> extends Generic {
 
 export interface MlGetJobStats extends Generic {
   job_id?: string;
+  allow_no_match?: boolean;
   allow_no_jobs?: boolean;
 }
 
 export interface MlGetJobs extends Generic {
   job_id?: string;
+  allow_no_match?: boolean;
   allow_no_jobs?: boolean;
+  exclude_generated?: boolean;
 }
 
 export interface MlGetModelSnapshots<T = RequestBody> extends Generic {
@@ -1656,6 +1702,7 @@ export interface MlGetOverallBuckets<T = RequestBody> extends Generic {
   exclude_interim?: boolean;
   start?: string;
   end?: string;
+  allow_no_match?: boolean;
   allow_no_jobs?: boolean;
   body?: T;
 }
@@ -1676,12 +1723,13 @@ export interface MlGetRecords<T = RequestBody> extends Generic {
 export interface MlGetTrainedModels extends Generic {
   model_id?: string;
   allow_no_match?: boolean;
+  include?: string;
   include_model_definition?: boolean;
   decompress_definition?: boolean;
   from?: number;
   size?: number;
   tags?: string | string[];
-  for_export?: boolean;
+  exclude_generated?: boolean;
 }
 
 export interface MlGetTrainedModelsStats extends Generic {
@@ -1787,11 +1835,13 @@ export interface MlStopDataFrameAnalytics<T = RequestBody> extends Generic {
   body?: T;
 }
 
-export interface MlStopDatafeed extends Generic {
+export interface MlStopDatafeed<T = RequestBody> extends Generic {
   datafeed_id: string;
+  allow_no_match?: boolean;
   allow_no_datafeeds?: boolean;
   force?: boolean;
   timeout?: string;
+  body?: T;
 }
 
 export interface MlUpdateDataFrameAnalytics<T = RequestBody> extends Generic {
@@ -1824,6 +1874,13 @@ export interface MlUpdateModelSnapshot<T = RequestBody> extends Generic {
   body: T;
 }
 
+export interface MlUpgradeJobSnapshot extends Generic {
+  job_id: string;
+  snapshot_id: string;
+  timeout?: string;
+  wait_for_completion?: boolean;
+}
+
 export interface MlValidate<T = RequestBody> extends Generic {
   body: T;
 }
@@ -1925,6 +1982,15 @@ export interface NodesUsage extends Generic {
   timeout?: string;
 }
 
+export interface OpenPointInTime extends Generic {
+  index?: string | string[];
+  preference?: string;
+  routing?: string;
+  ignore_unavailable?: boolean;
+  expand_wildcards?: 'open' | 'closed' | 'hidden' | 'none' | 'all';
+  keep_alive?: string;
+}
+
 export interface Ping extends Generic {
 }
 
@@ -1988,6 +2054,12 @@ export interface RollupPutJob<T = RequestBody> extends Generic {
   body: T;
 }
 
+export interface RollupRollup<T = RequestBody> extends Generic {
+  index: string;
+  rollup_index: string;
+  body: T;
+}
+
 export interface RollupRollupSearch<T = RequestBody> extends Generic {
   index: string | string[];
   type?: string;
@@ -2128,6 +2200,10 @@ export interface SecurityChangePassword<T = RequestBody> extends Generic {
   body: T;
 }
 
+export interface SecurityClearApiKeyCache extends Generic {
+  ids: string | string[];
+}
+
 export interface SecurityClearCachedPrivileges extends Generic {
   application: string | string[];
 }
@@ -2194,11 +2270,11 @@ export interface SecurityGetPrivileges extends Generic {
 }
 
 export interface SecurityGetRole extends Generic {
-  name?: string;
+  name?: string | string[];
 }
 
 export interface SecurityGetRoleMapping extends Generic {
-  name?: string;
+  name?: string | string[];
 }
 
 export interface SecurityGetToken<T = RequestBody> extends Generic {
@@ -2212,6 +2288,11 @@ export interface SecurityGetUser extends Generic {
 export interface SecurityGetUserPrivileges extends Generic {
 }
 
+export interface SecurityGrantApiKey<T = RequestBody> extends Generic {
+  refresh?: 'wait_for' | boolean;
+  body: T;
+}
+
 export interface SecurityHasPrivileges<T = RequestBody> extends Generic {
   user?: string;
   body: T;
@@ -2286,6 +2367,14 @@ export interface SnapshotCleanupRepository extends Generic {
   timeout?: string;
 }
 
+export interface SnapshotClone<T = RequestBody> extends Generic {
+  repository: string;
+  snapshot: string;
+  target_snapshot: string;
+  master_timeout?: string;
+  body: T;
+}
+
 export interface SnapshotCreate<T = RequestBody> extends Generic {
   repository: string;
   snapshot: string;
@@ -2417,6 +2506,7 @@ export interface TransformGetTransform extends Generic {
   from?: number;
   size?: number;
   allow_no_match?: boolean;
+  exclude_generated?: boolean;
 }
 
 export interface TransformGetTransformStats extends Generic {
@@ -2473,6 +2563,7 @@ export interface Update<T = RequestBody> extends Generic {
   timeout?: string;
   if_seq_no?: number;
   if_primary_term?: number;
+  require_alias?: boolean;
   body: T;
 }
 
@@ -2560,6 +2651,10 @@ export interface WatcherPutWatch<T = RequestBody> extends Generic {
   body?: T;
 }
 
+export interface WatcherQueryWatches<T = RequestBody> extends Generic {
+  body?: T;
+}
+
 export interface WatcherStart extends Generic {
 }
 

docs/authentication.asciidoc

@@ -1,129 +0,0 @@
-[[auth-reference]]
-== Authentication
-
-This document contains code snippets to show you how to connect to various {es} 
-providers.
-
-
-=== Elastic Cloud
-
-If you are using https://www.elastic.co/cloud[Elastic Cloud], the client offers 
-an easy way to connect to it via the `cloud` option. You must pass the Cloud ID 
-that you can find in the cloud console, then your username and password inside 
-the `auth` option.
-
-NOTE: When connecting to Elastic Cloud, the client will automatically enable 
-both request and response compression by default, since it yields significant 
-throughput improvements. Moreover, the client will also set the ssl option 
-`secureProtocol` to `TLSv1_2_method` unless specified otherwise. You can still 
-override this option by configuring them.
-
-IMPORTANT: Do not enable sniffing when using Elastic Cloud, since the nodes are 
-behind a load balancer, Elastic Cloud will take care of everything for you.
-Take a look https://www.elastic.co/blog/elasticsearch-sniffing-best-practices-what-when-why-how[here]
-to know more.
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  cloud: {
-    id: 'name:bG9jYWxob3N0JGFiY2QkZWZnaA==',
-  },
-  auth: {
-    username: 'elastic',
-    password: 'changeme'
-  }
-})
-----
-
-
-=== Basic authentication
-
-You can provide your credentials by passing the `username` and `password` 
-parameters via the `auth` option.
-
-NOTE: If you provide both basic authentication credentials and the Api Key configuration, the Api Key will take precedence.
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  node: 'https://localhost:9200',
-  auth: {
-    username: 'elastic',
-    password: 'changeme'
-  }
-})
-----
-
-
-Otherwise, you can provide your credentials in the node(s) URL.
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  node: 'https://username:password@localhost:9200'
-})
-----
-
-
-=== ApiKey authentication
-
-You can use the 
-https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html[ApiKey] 
-authentication by passing the `apiKey` parameter via the `auth` option. The 
-`apiKey` parameter can be either a base64 encoded string or an object with the 
-values that you can obtain from the 
-https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html[create api key endpoint].
-
-NOTE: If you provide both basic authentication credentials and the Api Key configuration, the Api Key will take precedence.
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  node: 'https://localhost:9200',
-  auth: {
-    apiKey: 'base64EncodedKey'
-  }
-})
-----
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  node: 'https://localhost:9200',
-  auth: {
-    apiKey: {
-      id: 'foo',
-      api_key: 'bar'
-    }
-  }
-})
-----
-
-
-=== SSL configuration
-
-Without any additional configuration you can specify `https://` node urls, and 
-the certificates used to sign these requests will be verified. To turn off certificate verification, you must specify an `ssl` object in the top level config and set `rejectUnauthorized: false`. The default `ssl` values are the same that Node.js's https://nodejs.org/api/tls.html#tls_tls_connect_options_callback[`tls.connect()`] 
-uses.
-
-[source,js]
-----
-const { Client } = require('@elastic/elasticsearch')
-const client = new Client({
-  node: 'https://localhost:9200',
-  auth: {
-    username: 'elastic',
-    password: 'changeme'
-  },
-  ssl: {
-    ca: fs.readFileSync('./cacert.pem'),
-    rejectUnauthorized: false
-  }
-})
-----

docs/breaking-changes.asciidoc

@@ -6,6 +6,7 @@ to install with `npm install elasticsearch` – you will encounter some breaking
 changes.
 
 
+[discrete]
 === Don’t panic!
 
 Every breaking change was carefully weighed, and each is justified. Furthermore, 
@@ -13,6 +14,7 @@ the new codebase has been rewritten with modern JavaScript and has been
 carefully designed to be easy to maintain.
 
 
+[discrete]
 === Breaking changes
 
 *  Minimum supported version of Node.js is `v8`.
@@ -209,6 +211,7 @@ client.transport.request({
 })
 ----
 
+[discrete]
 === Talk is cheap. Show me the code.
 
 You can find a code snippet with the old client below followed by the same code 

docs/changelog.asciidoc

@@ -1,14 +1,231 @@
 [[changelog-client]]
 == Changelog
 
-=== 7.8.0
+[discrete]
+=== 7.10.0
 
+[discrete]
 ==== Features
 
+[discrete]
+===== Support for Elasticsearch `v7.10`.
+
+You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/7.10/release-notes-7.10.0.html[here].
+
+[discrete]
+=====  Added proxy support https://github.com/elastic/elasticsearch-js/pull/1260[#1260]
+
+If you need to pass through an http(s) proxy for connecting to Elasticsearch, the client offers
+out of the box a handy configuration for helping you with it. Under the hood it
+uses the https://github.com/delvedor/hpagent[`hpagent`] module.
+
+[source,js]
+----
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http://localhost:8080'
+})
+----
+
+Basic authentication is supported as well:
+
+[source,js]
+----
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http://user:pwd@localhost:8080'
+})
+----
+
+[discrete]
+==== Fixes
+
+[discrete]
+===== Scroll search should clear the scroll at the end https://github.com/elastic/elasticsearch-js/pull/1331[#1331]
+
+From now on the scroll search helper will automatically close the scroll on Elasticsearch,
+by doing so, Elasticsearch will free resources faster.
+
+[discrete]
+===== Handle connectivity issues while reading the body https://github.com/elastic/elasticsearch-js/pull/1343[#1343]
+
+It might happen that the underlying socket stops working due to an external cause while reading the body.
+This could lead to an unwanted `DeserialzationError`. From now, this will be handled as a generic `ConnectionError`.
+
+[discrete]
+==== Warnings
+
+[discrete]
+===== Add warning log about nodejs version support https://github.com/elastic/elasticsearch-js/pull/1349[#1349]
+
+`7.11` will be the last version of the client that will support Node.js v8, while `7.12` will be
+the last one that supports Node.js v10. If you are eusing this versions you will see a 
+`DeprecationWaring` in your logs. We strongly recommend to upgrade to newer versions of Node.js
+as usng an EOL version will expose you to securty risks.
+
+Please refer to https://ela.st/nodejs-support[ela.st/nodejs-support] for additional information.
+
+[discrete]
+=== 7.9.1
+
+[discrete]
+==== Fixes
+
+[discrete]
+===== Improve child performances https://github.com/elastic/elasticsearch-js/pull/1314[#1314]
+
+The client code has been refactored to speed up the performances of the child method.
+Before this pr, creating many children per second would have caused a high memory consumption and a spike in CPU usage.
+This pr changes the way the client is created by refactoring the code generation, now the clients methods are no longer added to the instance with a for loop but via prototypal inheritance. Thus, the overall performances are way better, now creating a child is ~5 times faster, and it consumes ~70% less memory.
+
+This change should not cause any breaking change unless you were mocking the client methods. In such case you should refactor it, or use https://github.com/elastic/elasticsearch-js-mock[elasticsearch-js-mock].
+
+Finally, this change should also fix once and of all the bundlers support.
+
+[discrete]
+===== Throw all errors asynchronously https://github.com/elastic/elasticsearch-js/pull/1295[#1295]
+
+Some validation errors were thrown synchronously, causing the callback to be called in th same tick.
+This issue is known as _"The release fo Zalgo"_ (see https://blog.izs.me/2013/08/designing-apis-for-asynchrony[here]).
+
+[discrete]
+===== Fix `maxRetries` request option handling https://github.com/elastic/elasticsearch-js/pull/1296[#1296]
+
+The `maxRetries` parameter can be configured on a per requets basis, if set to zero it was defaulting to the client default. Now the client is honoring the request specific configuration.
+
+[discrete]
+===== Fix RequestOptions.body type to include null https://github.com/elastic/elasticsearch-js/pull/1300[#1300]
+
+The Connection requets option types were not accepting `null` as valid value.
+
+[discrete]
+===== Fixed `size` and `maxRetries` parameters in helpers https://github.com/elastic/elasticsearch-js/pull/1284[#1284]
+
+The `size` parameter was being passed too the scroll request, which was causing an error.
+`maxRetries` setted to 0 was resulting in no request at all.
+
+[discrete]
+=== 7.9.0
+
+[discrete]
+==== Features
+
+[discrete]
+===== Add ability to disable the http agent https://github.com/elastic/elasticsearch-js/pull/1251[#1251]
+
+If needed, the http agent can be disabled by setting it to `false`
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'http://localhost:9200'.
+  agent: false
+})
+----
+
+[discrete]
+===== Add support for a global context option https://github.com/elastic/elasticsearch-js/pull/1256[#1256]
+
+Before this, you could set a `context` option in each request, but there was no way of setting it globally.
+Now you can by configuring the `context` object in the global configuration, that will be merged with the local one.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'http://localhost:9200'.
+  context: { meta: 'data' }
+})
+----
+
+[discrete]
+===== ESM support https://github.com/elastic/elasticsearch-js/pull/1235[#1235]
+
+If you are using ES Modules, now you can easily import the client!
+
+[source,js]
+----
+import { Client } from '@elastic/elasticsearch'
+----
+
+[discrete]
+==== Fixes
+
+[discrete]
+===== Allow the client name to be a symbol https://github.com/elastic/elasticsearch-js/pull/1254[#1254]
+
+It was possible in plain JavaScript, but not in TypeScript, now you can do it in TypeScript as well.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'http://localhost:9200',
+  name: Symbol('unique')
+})
+----
+
+[discrete]
+===== Fixed transport.request querystring type https://github.com/elastic/elasticsearch-js/pull/1240[#1240]
+
+Only `Record<string, any>` was allowed. Now `string` is allowed as well.
+
+[discrete]
+===== Fixed type definitions https://github.com/elastic/elasticsearch-js/pull/1263[#1263]
+
+* The `transport.request` defintion was incorrect, it was returning a `Promise<T>` instead of `TransportRequestPromise<T>`.
+* The `refresh` parameter of most APIs was declared as `'true' | 'false' | 'wait_for'`, which was clunky. Now is `'wait_for' | boolean`.
+
+[discrete]
+===== Generate response type as boolean if the request is HEAD only https://github.com/elastic/elasticsearch-js/pull/1275[#1275]
+
+All HEAD request will have the body casted to a boolean value, `true` in case of a 200 response, `false` in case of
+a 404 response. The type definitions were not reflecting this behavior.
+
+[source,ts]
+----
+import { Client } from '@elastic/elasticsearch'
+const client = new Client({
+  node: 'http://localhost:9200'
+})
+
+const { body } = await client.exist({ index: 'my-index', id: 'my-id' })
+console.log(body) // either `true` or `false`
+----
+
+[discrete]
+==== Internals
+
+[discrete]
+===== Updated default http agent configuration https://github.com/elastic/elasticsearch-js/pull/1242[#1242]
+
+Added the scheduling: 'lifo' option to the default HTTP agent configuration to avoid maximizing the open sockets
+against Elasticsearch and lowering the risk of encountering socket timeouts.
+This feature is only available from Node v14.5+, but it should be backported to v10 and v12. (https://github.com/nodejs/node/pull/33278[nodejs/node#33278])
+
+[discrete]
+===== Improve child API https://github.com/elastic/elasticsearch-js/pull/1245[#1245]
+
+This pr introduce two changes which should not impact the surface API:
+
+* Refactored the `client.child` API to allocate fewer objects, this change improves memory consumption over time
+and improves the child creation performances by ~12%.
+* The client no longer inherits from the EventEmitter class, but instead has an internal event emitter and exposes
+only the API useful for the users, namely `emit, `on`, `once`, and `off`. The type definitions have been updated accordingly.
+
+[discrete]
+=== 7.8.0
+
+[discrete]
+==== Features
+
+[discrete]
 ===== Support for Elasticsearch `v7.8`.
 
 You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/7.8/release-notes-7.8.0.html[here].
 
+[discrete]
 =====  Added multi search helper https://github.com/elastic/elasticsearch-js/pull/1186[#1186]
 
 If you are sending search request at a high rate, this helper might be useful for you.
@@ -41,6 +258,7 @@ m.search(
 )
 ----
 
+[discrete]
 =====  Added timeout support in bulk and msearch helpers https://github.com/elastic/elasticsearch-js/pull/1206[#1206]
 
 If there is a slow producer, the bulk helper might send data with a very large period of time, and if the process crashes for any reason, the data would be lost.
@@ -62,38 +280,48 @@ const m = client.helpers.msearch({
 })
 ----
 
+[discrete]
 ==== Internals
 
+[discrete]
 =====  Use filter_path for improving the search helpers performances https://github.com/elastic/elasticsearch-js/pull/1199[#1199]
 
 From now on, all he search helpers will use the `filter_path` option automatically when needed to retrieve only the hits source. This change will result in less netwprk traffic and improved deserialization performances.
 
+[discrete]
 =====  Search helpers documents getter https://github.com/elastic/elasticsearch-js/pull/1186[#1186]
 
 Before this, the `documents` key that you can access in any search helper was computed as soon as we got the search result from Elasticsearch. With this change the `documents` key is now a getter, which makes this procees lazy, resulting in better performances and lower memory impact.
 
-
+[discrete]
 === 7.7.1
 
+[discrete]
 ==== Fixes
 
+[discrete]
 ===== Disable client Helpers in Node.js < 10 - https://github.com/elastic/elasticsearch-js/pull/1194[#1194]
 
 The client helpers can't be used in Node.js < 10 because it needs a custom flag to be able to use them.
 Given that not every provider allows the user to specify cuatom Node.js flags, the Helpers has been disabled completely in Node.js < 10.
 
+[discrete]
 ===== Force lowercase in all headers - https://github.com/elastic/elasticsearch-js/pull/1187[#1187]
 
 Now all the user-provided headers names will be lowercased by default, so there will be no conflicts in case of the same header with different casing.
 
+[discrete]
 === 7.7.0
 
+[discrete]
 ==== Features
 
+[discrete]
 ===== Support for Elasticsearch `v7.7`.
 
 You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/7.7/release-notes-7.7.0.html[here].
 
+[discrete]
 ===== Introduced client helpers - https://github.com/elastic/elasticsearch-js/pull/1107[#1107]
 
 From now on, the client comes with an handy collection of helpers to give you a more comfortable experience with some APIs.
@@ -107,11 +335,13 @@ The following helpers has been introduced:
 - `client.helpers.scrollSearch`
 - `client.helpers.scrollDocuments`
 
+[discrete]
 ===== The `ConnectionPool.getConnection` now always returns a `Connection` - https://github.com/elastic/elasticsearch-js/pull/1127[#1127]
 
 What does this mean? It means that you will see less `NoLivingConnectionError`, which now can only be caused if you set a selector/filter too strict.
 For improving the debugging experience, the `NoLivingConnectionsError` error message has been updated.
 
+[discrete]
 ===== Abortable promises - https://github.com/elastic/elasticsearch-js/pull/1141[#1141]
 
 From now on, it will be possible to abort a request generated with the promise-styl API. If you abort a request generated from a promise, the promise will be rejected with a `RequestAbortedError`.
@@ -132,6 +362,7 @@ promise
 promise.abort()
 ----
 
+[discrete]
 ===== Major refactor of the Type Definitions - https://github.com/elastic/elasticsearch-js/pull/1119[#1119] https://github.com/elastic/elasticsearch-js/issues/1130[#1130] https://github.com/elastic/elasticsearch-js/pull/1132[#1132]
 
 Now every API makes better use of the generics and overloading, so you can (or not, by default request/response bodies are `Record<string, any>`) define the request/response bodies in the generics.
@@ -147,25 +378,31 @@ client.search<SearchResponse, SearchBody>(...)
 
 This *should* not be a breaking change, as every generics defaults to `any`. It might happen to some users that the code breaks, but our test didn't detect any of it, probably because they were not robust enough. However, given the gigantic improvement in the developer experience, we have decided to release this change in the 7.x line.
 
+[discrete]
 ==== Fixes
 
+[discrete]
 ===== The `ConnectionPool.update` method now cleans the `dead` list - https://github.com/elastic/elasticsearch-js/issues/1122[#1122] https://github.com/elastic/elasticsearch-js/pull/1127[#1127]
 
 It can happen in a situation where we are updating the connections list and running sniff, leaving the `dead` list in a dirty state. Now the `ConnectionPool.update` cleans up the `dead` list every time, which makes way more sense given that all the new connections are alive.
 
+[discrete]
 ===== `ConnectionPoolmarkDead` should ignore connections that no longer exists - https://github.com/elastic/elasticsearch-js/pull/1159[#1159]
 
 It might happen that markDead is called just after a pool update, and in such case, the clint was adding the dead list a node that no longer exists, causing unhandled exceptions later.
 
+[discrete]
 ===== Do not retry a request if the body is a stream - https://github.com/elastic/elasticsearch-js/pull/1143[#1143]
 
 The client should not retry if it's sending a stream body, because it should store in memory a copy of the stream to be able to send it again, but since it doesn't know in advance the size of the stream, it risks to take too much memory.
 Furthermore, copying everytime the stream is very an expensive operation.
 
+[discrete]
 ===== Return an error if the request has been aborted - https://github.com/elastic/elasticsearch-js/pull/1141[#1141]
 
 Until now, aborting a request was blocking the HTTP request, but never calling the callback or resolving the promise to notify the user. This is a bug because it could lead to dangerous memory leaks. From now on if the user calls the `request.abort()` method, the callback style API will be called with a `RequestAbortedError`, the promise will be rejected with `RequestAbortedError` as well.
 
+[discrete]
 === 7.6.1
 
 **Fixes:**
@@ -177,10 +414,12 @@ Until now, aborting a request was blocking the HTTP request, but never calling t
 
 - Fix typo in api reference - https://github.com/elastic/elasticsearch-js/pull/1109[#1109]
 
+[discrete]
 === 7.6.0
 
 Support for Elasticsearch `v7.6`.
 
+[discrete]
 === 7.5.1
 
 **Fixes:**
@@ -196,6 +435,7 @@ Support for Elasticsearch `v7.6`.
 - Add examples to reference - https://github.com/elastic/elasticsearch-js/pull/1076[#1076]
 - Added new examples - https://github.com/elastic/elasticsearch-js/pull/1031[#1031]
 
+[discrete]
 === 7.5.0
 
 Support for Elasticsearch `v7.5`.
@@ -204,6 +444,7 @@ Support for Elasticsearch `v7.5`.
 
 - X-Opaque-Id support https://github.com/elastic/elasticsearch-js/pull/997[#997]
 
+[discrete]
 === 7.4.0
 
 Support for Elasticsearch `v7.4`.
@@ -221,6 +462,7 @@ Support for Elasticsearch `v7.4`.
 
 - Update code generation https://github.com/elastic/elasticsearch-js/pull/969[#969]
 
+[discrete]
 === 7.3.0
 
 Support for Elasticsearch `v7.3`.
@@ -243,6 +485,7 @@ Support for Elasticsearch `v7.3`.
 - Better reference code examples - https://github.com/elastic/elasticsearch-js/pull/920[#920]
 - Improve README - https://github.com/elastic/elasticsearch-js/pull/909[#909]
 
+[discrete]
 === 7.2.0
 
 Support for Elasticsearch `v7.2`
@@ -251,6 +494,7 @@ Support for Elasticsearch `v7.2`
 
 - Remove auth data from inspect and toJSON in connection class - https://github.com/elastic/elasticsearch-js/pull/887[#887]
 
+[discrete]
 === 7.1.0
 
 Support for Elasticsearch `v7.1`
@@ -260,6 +504,7 @@ Support for Elasticsearch `v7.1`
 - Support for non-friendly chars in url username and password - https://github.com/elastic/elasticsearch-js/pull/858[#858]
 - Patch deprecated parameters - https://github.com/elastic/elasticsearch-js/pull/851[#851]
 
+[discrete]
 === 7.0.1
 
 **Fixes:**
@@ -269,8 +514,9 @@ Support for Elasticsearch `v7.1`
 - Fix TypeScript definiton *(issue https://github.com/elastic/elasticsearch-js/pull/803[#803])* - https://github.com/elastic/elasticsearch-js/pull/846[#846]
 - Added toJSON method to Connection class *(issue https://github.com/elastic/elasticsearch-js/pull/848[#848])* - https://github.com/elastic/elasticsearch-js/pull/849[#849]
 
+[discrete]
 === 7.0.0
 
 Support for Elasticsearch `v7.0`
 
-- Stable release.
+- Stable release.

docs/configuration.asciidoc

@@ -17,7 +17,7 @@ const client = new Client({
 })
 ----
 
-
+[discrete]
 === Basic options
 
 [cols=2*]
@@ -117,6 +117,24 @@ _Default:_ `false`
 |`http.SecureContextOptions` - ssl https://nodejs.org/api/tls.html[configuraton]. +
 _Default:_ `null`
 
+|`proxy`
+a|`string, URL` - If you are using an http(s) proxy, you can put its url here.
+The client will automatically handle the connection to it. +
+_Default:_ `null`
+[source,js]
+----
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http://localhost:8080'
+})
+
+// Proxy with basic authentication
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http://user:pwd@localhost:8080'
+})
+----
+
 |`agent`
 a|`http.AgentOptions, function` - http agent https://nodejs.org/api/http.html#http_new_agent_options[options], 
 or a function that returns an actual http agent instance. If you want to disable the http agent use entirely
@@ -131,7 +149,9 @@ const client = new Client({
 
 const client = new Client({
   node: 'http://localhost:9200',
-  agent: () => new CustomAgent()
+  // the function takes as parameter the option
+  // object passed to the Connection constructor
+  agent: (opts) => new CustomAgent()
 })
 
 const client = new Client({
@@ -185,7 +205,7 @@ function generateRequestId (params, options) {
 ----
 
 |`name`
-|`string | symbol` - The name to identify the client instance in the events. +
+|`string, symbol` - The name to identify the client instance in the events. +
 _Default:_ `elasticsearch-js`
 
 |`opaqueIdPrefix`
@@ -198,10 +218,15 @@ _Default:_ `null`
 _Default:_ `{}`
 
 |`context`
-|`object` - A custom object that you can use for observability in yoru events.
+|`object` - A custom object that you can use for observability in your events.
 It will be merged with the API level context option. +
 _Default:_ `null`
 
+|`enableMetaHeader`
+|`boolean` - If true, adds an header named `'x-elastic-client-meta'`, containing some minimal telemetry data,
+such as the client and platform version. +
+_Default:_ `true`
+
 |`cloud`
 a|`object` - Custom configuration for connecting to 
 https://cloud.elastic.co[Elastic Cloud]. See https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/auth-reference.html[Authentication] 
@@ -224,6 +249,7 @@ const client = new Client({
 |===
 
 
+[discrete]
 === Advanced configuration
 
 If you need to customize the client behavior heavily, you are in the right 
@@ -235,6 +261,7 @@ place! The client allows you to customize the following internals:
 * `Serializer` class
 
 
+[discrete]
 === `Transport`
 
 This class is responsible for performing the request to {es} and handling 
@@ -269,6 +296,7 @@ class MyTransport extends Transport {
 ----
 
 
+[discrete]
 === `ConnectionPool`
 
 This class is responsible for keeping in memory all the {es} Connection that we 
@@ -292,6 +320,7 @@ const client = new Client({
 ----
 
 
+[discrete]
 === `Connection`
 
 This class represents a single node, it holds every information we have on the 
@@ -315,6 +344,7 @@ const client = new Client({
 ----
 
 
+[discrete]
 === `Serializer`
 
 This class is responsible for the serialization of every request, it offers the 

docs/connecting.asciidoc

@@ -1,5 +1,164 @@
+[[client-connecting]]
+== Connecting 
+
+This page contains the information you need to connect and use the Client with 
+{es}.
+
+**On this page**
+
+* <<auth-reference, Authentication options>>
+* <<client-usage, Using the client>>
+* <<client-connect-proxy, Connecting through a proxy>>
+* <<client-error-handling, Handling errors>>
+
+[discrete]
+[[authentication]]
+=== Authentication
+
+This document contains code snippets to show you how to connect to various {es} 
+providers.
+
+
+[discrete]
+[[auth-ec]]
+==== Elastic Cloud
+
+If you are using https://www.elastic.co/cloud[Elastic Cloud], the client offers 
+an easy way to connect to it via the `cloud` option. You must pass the Cloud ID 
+that you can find in the cloud console, then your username and password inside 
+the `auth` option.
+
+NOTE: When connecting to Elastic Cloud, the client will automatically enable 
+both request and response compression by default, since it yields significant 
+throughput improvements. Moreover, the client will also set the ssl option 
+`secureProtocol` to `TLSv1_2_method` unless specified otherwise. You can still 
+override this option by configuring them.
+
+IMPORTANT: Do not enable sniffing when using Elastic Cloud, since the nodes are 
+behind a load balancer, Elastic Cloud will take care of everything for you.
+Take a look https://www.elastic.co/blog/elasticsearch-sniffing-best-practices-what-when-why-how[here]
+to know more.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  cloud: {
+    id: 'name:bG9jYWxob3N0JGFiY2QkZWZnaA==',
+  },
+  auth: {
+    username: 'elastic',
+    password: 'changeme'
+  }
+})
+----
+
+
+[discrete]
+[[auth-apikey]]
+==== ApiKey authentication
+
+You can use the 
+https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html[ApiKey] 
+authentication by passing the `apiKey` parameter via the `auth` option. The 
+`apiKey` parameter can be either a base64 encoded string or an object with the 
+values that you can obtain from the 
+https://www.elastic.co/guide/en/elasticsearch/reference/7.x/security-api-create-api-key.html[create api key endpoint].
+
+NOTE: If you provide both basic authentication credentials and the ApiKey 
+configuration, the ApiKey takes precedence.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'https://localhost:9200',
+  auth: {
+    apiKey: 'base64EncodedKey'
+  }
+})
+----
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'https://localhost:9200',
+  auth: {
+    apiKey: {
+      id: 'foo',
+      api_key: 'bar'
+    }
+  }
+})
+----
+
+
+[discrete]
+[[auth-basic]]
+==== Basic authentication
+
+You can provide your credentials by passing the `username` and `password` 
+parameters via the `auth` option.
+
+NOTE: If you provide both basic authentication credentials and the Api Key 
+configuration, the Api Key will take precedence.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'https://localhost:9200',
+  auth: {
+    username: 'elastic',
+    password: 'changeme'
+  }
+})
+----
+
+
+Otherwise, you can provide your credentials in the node(s) URL.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'https://username:password@localhost:9200'
+})
+----
+
+
+[discrete]
+[[auth-ssl]]
+==== SSL configuration
+
+Without any additional configuration you can specify `https://` node urls, and 
+the certificates used to sign these requests will be verified. To turn off 
+certificate verification, you must specify an `ssl` object in the top level 
+config and set `rejectUnauthorized: false`. The default `ssl` values are the 
+same that Node.js's 
+https://nodejs.org/api/tls.html#tls_tls_connect_options_callback[`tls.connect()`] 
+uses.
+
+[source,js]
+----
+const { Client } = require('@elastic/elasticsearch')
+const client = new Client({
+  node: 'https://localhost:9200',
+  auth: {
+    username: 'elastic',
+    password: 'changeme'
+  },
+  ssl: {
+    ca: fs.readFileSync('./cacert.pem'),
+    rejectUnauthorized: false
+  }
+})
+----
+
+[discrete]
 [[client-usage]]
-== Usage
+=== Usage
 
 Using the client is straightforward, it supports all the public APIs of {es}, 
 and every method exposes the same signature.
@@ -33,7 +192,7 @@ client.search({
 })
 ----
 
-The returned value of every API call is formed as follows:
+The returned value of every API call is designed as follows:
 
 [source,ts]
 ----
@@ -81,11 +240,14 @@ client.search({
 ----
 
 
-=== Aborting a request
+[discrete]
+==== Aborting a request
 
-If needed, you can abort a running request by calling the `request.abort()` method returned by the API.
+If needed, you can abort a running request by calling the `request.abort()` 
+method returned by the API.
 
-CAUTION: If you abort a request, the request will fail with a `RequestAbortedError`.
+CAUTION: If you abort a request, the request will fail with a 
+`RequestAbortedError`.
 
 
 [source,js]
@@ -112,6 +274,7 @@ request.abort()
 ----
 
 The same behavior is valid for the promise style API as well.
+
 [source,js]
 ----
 const request = client.search({
@@ -134,7 +297,9 @@ request.abort()
 ----
 
 
-=== Request specific options
+[discrete]
+==== Request specific options
+
 If needed you can pass request specific options in a second object:
 
 [source,js]
@@ -211,6 +376,51 @@ _Default:_ `null`
 |===
 
 
+[discrete]
+[[client-connect-proxy]]
+=== Connecting through a proxy
+
+~Added~ ~in~ ~`v7.10.0`~
+
+If you need to pass through an http(s) proxy for connecting to {es}, the client 
+offers out of the box a handy configuration for helping you with it. Under the 
+hood, it uses the https://github.com/delvedor/hpagent[`hpagent`] module.
+
+[source,js]
+----
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http://localhost:8080'
+})
+----
+
+Basic authentication is supported as well:
+
+[source,js]
+----
+const client = new Client({
+  node: 'http://localhost:9200',
+  proxy: 'http:user:pwd@//localhost:8080'
+})
+----
+
+If you are connecting through a not http(s) proxy, such as a `socks5` or `pac`,
+you can use the `agent` option to configure it.
+
+[source,js]
+----
+const SocksProxyAgent = require('socks-proxy-agent')
+const client = new Client({
+  node: 'http://localhost:9200',
+  agent () {
+    return new SocksProxyAgent('socks://127.0.0.1:1080')
+  }
+})
+----
+
+
+[discrete]
+[[client-error-handling]]
 === Error handling
 
 The client exposes a variety of error objects that you can use to enhance your 

docs/examples/bulk.asciidoc

@@ -38,7 +38,7 @@ async function run () {
     date: new Date()
   }, {
     id: 2,
-    text: 'Witer is coming',
+    text: 'Winter is coming',
     user: 'ned',
     date: new Date()
   }, {

docs/examples/proxy/.gitignore

@@ -0,0 +1,51 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# coverage output
+coverage.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# mac files
+.DS_Store
+
+# vim swap files
+*.swp
+
+#Jetbrains editor folder
+.idea
+
+.vercel

docs/examples/proxy/README.md

@@ -0,0 +1,65 @@
+# Elasticsearch proxy example
+
+This folder contains an example of how to build a lightweight proxy
+between your frontend code and Elasticsearch if you don't
+have a more sophisticated backend in place yet.
+
+> **IMPORTANT:** This is not a production ready code and it is only for demonstration purposes,
+> we make no guarantees on it's security and stability.
+
+This project is designed to be deployed on [Vercel](https://vercel.com/), a cloud platform
+for static sites and Serverless Functions. You can use other functions providers,
+such as [Google Cloud functions](https://cloud.google.com/functions).
+
+## Project structure
+
+The project comes with four endpoints:
+
+- `/api/search`: runs a search, requires `'read'` permission
+- `/api/autocomplete`: runs an autocomplete suggestion, requires `'read'` permission
+- `/api/index`:  indexes or updates a document, requires `'write'` permission
+- `/api/delete`: deletes a document, requires `'write'` permission
+
+Inside `utils/authorize.js` you can find the authorization logic for the endpoints.
+In each endpoint you should configure the `INDEX` variable.
+
+## How to use
+
+Create an account on Vercel, then create a deployment on Elastic Cloud. If you
+don't have an account on Elastic Cloud, you can create one with a free 14-day trial
+of the [Elasticsearch Service](https://www.elastic.co/elasticsearch/service).
+
+### Configure Elasticsearch
+
+Once you have created a deployment on Elastic Cloud copy the generated Cloud Id and the credentials.
+Then open `utils/prepare-elasticsearch.js` and fill your credentials. The script generates
+an [Api Key](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html)
+that you can use for authenticating your request. Based on the configuration of the Api Key, you will be able
+to perform different operation on the specified indices or index pattern.
+
+### Configure Vercel
+
+Install the [Vercel CLI](https://vercel.com/docs/cli) to bootstrap the project,
+or read the [quickstart](https://vercel.com/docs) documentation.
+
+If you are using the CLI, bootstrap the project by running `vercel`. Test the project locally
+with `vercel dev`, and deploy it with `vercel deploy`.
+Configure the `ELASTIC_CLOUD_ID` [environment varible](https://vercel.com/docs/environment-variables) as well.
+The Api Key is passed from the frontend app via a `Authorization` header as `Bearer` token and is
+used to authorize the API calls to the endpoints as well.
+Additional configuration, such as CORS, can be added to [`vercel.json`](https://vercel.com/docs/configuration).
+
+## Authentication
+
+If you are using Elasticsearch only for search purposes, such as a search box, you can create
+an Api Key with `read` permissions and store it in your frontend app. Then you can send it
+via `Authorization` header to the proxy and run your searches.
+
+If you need to ingest data as well, it's more secure to have a strong authentication in your application.
+For such cases, use an external authentication service, such as [Auth0](https://auth0.com/)
+or [Magic Link](https://magic.link/). Then create a different Api Key with `read` and `write`
+permissions for authenticated users, that will not be stored in the frontend app.
+
+## License
+
+This software is licensed under the [Apache 2 license](../../LICENSE).

docs/examples/proxy/api/autocomplete.js

@@ -0,0 +1,105 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// IMPORTANT: this is not a production ready code & purely for demonstration purposes,
+//            we make no guarantees on it's security and stability
+
+// NOTE: to make this endpoint work, you should create an ApiKey with 'read' permissions
+
+'use strict'
+
+const { Client } = require('@elastic/elasticsearch')
+const authorize = require('../utils/authorize')
+
+const INDEX = '<index-name>'
+const client = new Client({
+  cloud: {
+    id: process.env.ELASTIC_CLOUD_ID
+  }
+})
+
+module.exports = async (req, res) => {
+  const [err, token] = authorize(req)
+  if (err) {
+    res.status(401)
+    res.json(err)
+    return
+  }
+
+  if (typeof req.query.q !== 'string') {
+    res.status(400)
+    res.json({
+      error: 'Bad Request',
+      message: 'Missing parameter "query.q"',
+      statusCode: 400
+    })
+    return
+  }
+
+  if (req.query.q.length < 3) {
+    res.status(400)
+    res.json({
+      error: 'Bad Request',
+      message: 'The length of "query.q" should be at least 3',
+      statusCode: 400
+    })
+    return
+  }
+
+  try {
+    const response = await client.search({
+      index: INDEX,
+      // You could directly send from the browser
+      // the Elasticsearch's query DSL, but it will
+      // expose you to the risk that a malicious user
+      // could overload your cluster by crafting
+      // expensive queries.
+      body: {
+        _source: ['id', 'url', 'name'], // the fields you want to show in the autocompletion
+        size: 0,
+        // https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+        suggest: {
+          suggestions: {
+            prefix: req.query.q,
+            completion: {
+              field: 'suggest',
+              size: 5
+            }
+          }
+        }
+      }
+    }, {
+      headers: {
+        Authorization: `ApiKey ${token}`
+      }
+    })
+
+    // It might be useful to configure http control caching headers
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
+    // res.setHeader('stale-while-revalidate', '30')
+    res.json(response.body)
+  } catch (err) {
+    res.status(err.statusCode || 500)
+    res.json({
+      error: err.name,
+      message: err.message,
+      statusCode: err.statusCode || 500
+    })
+  }
+}

docs/examples/proxy/api/delete.js

@@ -0,0 +1,74 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// IMPORTANT: this is not a production ready code & purely for demonstration purposes,
+//            we make no guarantees on it's security and stability
+
+// NOTE: to make this endpoint work, you should create an ApiKey with 'write' permissions
+
+'use strict'
+
+const { Client } = require('@elastic/elasticsearch')
+const authorize = require('../utils/authorize')
+
+const INDEX = '<index-name>'
+const client = new Client({
+  cloud: {
+    id: process.env.ELASTIC_CLOUD_ID
+  }
+})
+
+module.exports = async (req, res) => {
+  const [err, token] = authorize(req)
+  if (err) {
+    res.status(401)
+    res.json(err)
+    return
+  }
+
+  if (typeof req.query.id !== 'string' && req.query.id.length === 0) {
+    res.status(400)
+    res.json({
+      error: 'Bad Request',
+      message: 'Missing document id',
+      statusCode: 400
+    })
+    return
+  }
+
+  try {
+    const response = await client.delete({
+      index: INDEX,
+      id: req.query.id
+    }, {
+      headers: {
+        Authorization: `ApiKey ${token}`
+      }
+    })
+
+    res.json(response.body)
+  } catch (err) {
+    res.status(err.statusCode || 500)
+    res.json({
+      error: err.name,
+      message: err.message,
+      statusCode: err.statusCode || 500
+    })
+  }
+}

docs/examples/proxy/api/index.js

@@ -0,0 +1,76 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// IMPORTANT: this is not a production ready code & purely for demonstration purposes,
+//            we make no guarantees on it's security and stability
+
+// NOTE: to make this endpoint work, you should create an ApiKey with 'write' permissions
+
+'use strict'
+
+const { Client } = require('@elastic/elasticsearch')
+const authorize = require('../utils/authorize')
+
+const INDEX = '<index-name>'
+const client = new Client({
+  cloud: {
+    id: process.env.ELASTIC_CLOUD_ID
+  }
+})
+
+module.exports = async (req, res) => {
+  const [err, token] = authorize(req)
+  if (err) {
+    res.status(401)
+    res.json(err)
+    return
+  }
+
+  if (typeof req.body !== 'object') {
+    res.status(400)
+    res.json({
+      error: 'Bad Request',
+      message: 'The document should be an object',
+      statusCode: 400
+    })
+    return
+  }
+
+  try {
+    const response = await client.index({
+      index: INDEX,
+      id: req.query.id,
+      body: req.body
+    }, {
+      headers: {
+        Authorization: `ApiKey ${token}`
+      }
+    })
+
+    res.status(response.statusCode)
+    res.json(response.body)
+  } catch (err) {
+    res.status(err.statusCode || 500)
+    res.json({
+      error: err.name,
+      message: err.message,
+      statusCode: err.statusCode || 500
+    })
+  }
+}

docs/examples/proxy/api/search.js

@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// IMPORTANT: this is not a production ready code & purely for demonstration purposes,
+//            we make no guarantees on it's security and stability
+
+// NOTE: to make this endpoint work, you should create an ApiKey with 'read' permissions
+
+'use strict'
+
+const { Client } = require('@elastic/elasticsearch')
+const authorize = require('../utils/authorize')
+
+const INDEX = '<index-name>'
+const client = new Client({
+  cloud: {
+    id: process.env.ELASTIC_CLOUD_ID
+  }
+})
+
+module.exports = async (req, res) => {
+  const [err, token] = authorize(req)
+  if (err) {
+    res.status(401)
+    res.json(err)
+    return
+  }
+
+  if (typeof req.body.text !== 'string') {
+    res.status(400)
+    res.json({
+      error: 'Bad Request',
+      message: 'Missing parameter "body.text"',
+      statusCode: 400
+    })
+    return
+  }
+
+  try {
+    const response = await client.search({
+      index: INDEX,
+      // You could directly send from the browser
+      // the Elasticsearch's query DSL, but it will
+      // expose you to the risk that a malicious user
+      // could overload your cluster by crafting
+      // expensive queries.
+      body: {
+        query: {
+          match: { field: req.body.text }
+        }
+      }
+    }, {
+      headers: {
+        Authorization: `ApiKey ${token}`
+      }
+    })
+
+    // It might be useful to configure http control caching headers
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
+    // res.setHeader('stale-while-revalidate', '30')
+    res.json(response.body)
+  } catch (err) {
+    res.status(err.statusCode || 500)
+    res.json({
+      error: err.name,
+      message: err.message,
+      statusCode: err.statusCode || 500
+    })
+  }
+}

docs/examples/proxy/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "proxy-example",
+  "version": "1.0.0",
+  "private": true,
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "standard"
+  },
+  "keywords": [],
+  "author": "Tomas Della Vedova",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@elastic/elasticsearch": "^7.10.0"
+  },
+  "devDependencies": {
+    "standard": "^16.0.3"
+  }
+}

docs/examples/proxy/utils/authorize.js

@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// IMPORTANT: this is not a production ready code & purely for demonstration purposes,
+//            we make no guarantees on it's security and stability
+
+'use strict'
+
+module.exports = (req) => {
+  const auth = req.headers.authorization
+  if (typeof auth !== 'string') {
+    return [{
+      error: 'Unauthorized',
+      message: 'Missing authorization header',
+      statusCode: 401
+    }, null]
+  }
+
+  const [type, token] = req.headers.authorization.split(' ')
+
+  if (type !== 'Bearer') {
+    return [{
+      error: 'Unauthorized',
+      message: 'Bad authorization type',
+      statusCode: 401
+    }, null]
+  }
+
+  if (token.length === 0) {
+    return [{
+      error: 'Unauthorized',
+      message: 'Bad authorization token',
+      statusCode: 401
+    }, null]
+  }
+
+  return [null, token]
+}

docs/examples/proxy/utils/prepare-elasticsearch.js

@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const { Client } = require('@elastic/elasticsearch')
+
+// Your Cloud Id
+const cloudId = ''
+// Your admin username
+const username = ''
+// Your admin password
+const password = ''
+// The indices or index patterns you will need to access
+const indexNames = ['my-index-name-or-pattern']
+// see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-privileges.html#privileges-list-indices
+const privileges = ['read']
+
+async function generateApiKeys (opts) {
+  const client = new Client({
+    cloud: {
+      id: cloudId
+    },
+    auth: {
+      username,
+      password
+    }
+  })
+
+  const { body } = await client.security.createApiKey({
+    body: {
+      name: 'elasticsearch-proxy',
+      role_descriptors: {
+        'elasticsearch-proxy-users': {
+          index: [{
+            names: indexNames,
+            privileges
+          }]
+        }
+      }
+    }
+  })
+
+  return Buffer.from(`${body.id}:${body.api_key}`).toString('base64')
+}
+
+generateApiKeys()
+  .then(console.log)
+  .catch(err => {
+    console.error(err)
+    process.exit(1)
+  })

docs/examples/proxy/vercel.json

@@ -0,0 +1,13 @@
+{
+  "headers": [
+    {
+      "source": "/api/(.*)",
+      "headers": [
+        { "key": "Access-Control-Allow-Credentials", "value": "true" },
+        { "key": "Access-Control-Allow-Origin", "value": "*" },
+        { "key": "Access-Control-Allow-Methods", "value": "GET,OPTIONS,PATCH,DELETE,POST,PUT" },
+        { "key": "Access-Control-Allow-Headers", "value": "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version" }
+      ]
+    }
+  ]
+}

docs/helpers.asciidoc

@@ -6,12 +6,16 @@ The client comes with an handy collection of helpers to give you a more comforta
 CAUTION: The client helpers are experimental, and the API may change in the next minor releases.
 The helpers will not work in any Node.js version lower than 10.
 
+
+[discrete]
 === Bulk Helper
 
 ~Added~ ~in~ ~`v7.7.0`~
 
 Running Bulk requests can be complex due to the shape of the API, this helper aims to provide a nicer developer experience around the Bulk API.
 
+
+[discrete]
 ==== Usage
 [source,js]
 ----
@@ -150,8 +154,12 @@ const b = client.helpers.bulk({
 
 |===
 
+
+[discrete]
 ==== Supported operations
 
+
+[discrete]
 ===== Index
 [source,js]
 ----
@@ -165,6 +173,8 @@ client.helpers.bulk({
 })
 ----
 
+
+[discrete]
 ===== Create
 [source,js]
 ----
@@ -178,14 +188,17 @@ client.helpers.bulk({
 })
 ----
 
+
+[discrete]
 ===== Update
+
 [source,js]
 ----
 client.helpers.bulk({
   datasource: myDatasource,
   onDocument (doc) {
     // Note that the update operation requires you to return
-    // an array, where the first element is the actio, while
+    // an array, where the first element is the action, while
     // the second are the document option
     return [
       { update: { _index: 'my-index', _id: doc.id } },
@@ -195,7 +208,10 @@ client.helpers.bulk({
 })
 ----
 
+
+[discrete]
 ===== Delete
+
 [source,js]
 ----
 client.helpers.bulk({
@@ -208,7 +224,10 @@ client.helpers.bulk({
 })
 ----
 
+
+[discrete]
 ==== Abort a bulk operation
+
 If needed, you can abort a bulk operation at any time. The bulk helper returns a https://promisesaplus.com/[thenable], which has an `abort` method.
 
 NOTE: The abort method will stop the execution of the bulk operation, but if you are using a concurrency higher than one, the operations that are already running will not be stopped.
@@ -235,7 +254,10 @@ const b = client.helpers.bulk({
 console.log(await b)
 ----
 
+
+[discrete]
 ==== Passing custom options to the Bulk API
+
 You can pass any option supported by the link:{ref}/docs-bulk.html#docs-bulk-api-query-params[Bulk API] to the helper, and the helper will use those options in conjuction with the Bulk 
 API call.
 
@@ -252,6 +274,8 @@ const result = await client.helpers.bulk({
 })
 ----
 
+
+[discrete]
 ==== Usage with an async generator
 
 [source,js]
@@ -282,6 +306,8 @@ const result = await client.helpers.bulk({
 console.log(result)
 ----
 
+
+[discrete]
 === Multi Search Helper
 
 ~Added~ ~in~ ~`v7.8.0`~
@@ -290,7 +316,10 @@ If you are sending search request at a high rate, this helper might be useful fo
 It will use the mutli search API under the hood to batch the requests and improve the overall performances of your application. +
 The `result` exposes a `documents` property as well, which allows you to access directly the hits sources.
 
+
+[discrete]
 ==== Usage
+
 [source,js]
 ----
 const { Client } = require('@elastic/elasticsearch')
@@ -372,7 +401,10 @@ const m = client.helpers.msearch({
 
 |===
 
+
+[discrete]
 ==== Stopping the Msearch Helper
+
 If needed, you can stop a msearch processor at any time. The msearch helper returns a https://promisesaplus.com/[thenable], which has an `stop` method.
 
 If you are creating multiple msearch helpers instances and using them for a limitied period of time, remember to always use the  `stop` method once you have finished using them, otherwise your application will start leaking memory.
@@ -405,6 +437,8 @@ m.search(
 setImmediate(() => m.stop())
 ----
 
+
+[discrete]
 === Search Helper
 
 ~Added~ ~in~ ~`v7.7.0`~
@@ -430,6 +464,8 @@ for (const doc of documents) {
 }
 ----
 
+
+[discrete]
 === Scroll Search Helper
 
 ~Added~ ~in~ ~`v7.7.0`~
@@ -455,6 +491,8 @@ for await (const result of scrollSearch) {
 }
 ----
 
+
+[discrete]
 ==== Clear a scroll search
 
 If needed, you can clear a scroll search by calling `result.clear()`:
@@ -468,6 +506,8 @@ for await (const result of scrollSearch) {
 }
 ----
 
+
+[discrete]
 ==== Quickly getting the documents
 
 If you only need the documents from the result of a scroll search, you can access them via `result.documents`:
@@ -479,6 +519,8 @@ for await (const result of scrollSearch) {
 }
 ----
 
+
+[discrete]
 === Scroll Documents Helper
 
 ~Added~ ~in~ ~`v7.7.0`~

docs/index.asciidoc

@@ -4,12 +4,12 @@
 include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 
 include::introduction.asciidoc[]
+include::installation.asciidoc[]
+include::connecting.asciidoc[]
 include::changelog.asciidoc[]
-include::usage.asciidoc[]
 include::configuration.asciidoc[]
 include::reference.asciidoc[]
 include::breaking-changes.asciidoc[]
-include::authentication.asciidoc[]
 include::observability.asciidoc[]
 include::child.asciidoc[]
 include::extend.asciidoc[]
@@ -17,3 +17,4 @@ include::helpers.asciidoc[]
 include::typescript.asciidoc[]
 include::testing.asciidoc[]
 include::examples/index.asciidoc[]
+include::redirects.asciidoc[]

docs/installation.asciidoc

@@ -0,0 +1,94 @@
+[[installation]]
+== Installation
+
+This page guides you through the installation process of the client.
+
+To install the latest version of the client, run the following command:
+
+[source,sh]
+----
+npm install @elastic/elasticsearch
+----
+
+To install a specific major version of the client, run the following command:
+
+[source,sh]
+----
+npm install @elastic/elasticsearch@<major>
+----
+
+To learn more about the supported major versions, please refer to the 
+<<js-compatibility-matrix>>.
+
+[discrete]
+[[nodejs-support]]
+=== Node.js support
+
+NOTE: The minimum supported version of Node.js is `v8`.
+
+The client versioning follows the {stack} versioning, this means that
+major, minor, and patch releases are done following a precise schedule that
+often does not coincide with the https://nodejs.org/en/about/releases/[Node.js release] times.
+
+To avoid support insecure and unsupported versions of Node.js, the
+client *will drop the support of EOL versions of Node.js between minor releases*.
+Typically, as soon as a Node.js version goes into EOL, the client will continue
+to support that version for at least another minor release. If you are using the client
+with a version of Node.js that will be unsupported soon, you will see a warning
+in your logs (the client will start logging the warning with two minors in advance).
+
+Unless you are *always* using a supported version of Node.js, 
+we recommend defining the client dependency in your
+`package.json` with the `~` instead of `^`. In this way, you will lock the
+dependency on the minor release and not the major. (for example, `~7.10.0` instead
+of `^7.10.0`).
+
+[%header,cols=3*]
+|===
+|Node.js Version
+|Node.js EOL date
+|End of support
+
+|`8.x`
+|December 2019
+|`7.11` (early 2021)
+
+|`10.x`
+|April 2021
+|`7.12` (mid 2021)
+|===
+
+[discrete]
+[[js-compatibility-matrix]]
+=== Compatibility matrix
+
+The library is compatible with all {es} versions since 5.x. We recommend you to
+use the same major version of the client as the {es} instance that you are
+using.
+
+[%header,cols=2*]
+|===
+|{es} Version
+|Client Version
+
+|`master`
+|`master`
+
+|`7.x`
+|`7.x`
+
+|`6.x`
+|`6.x`
+
+|`5.x`
+|`5.x`
+|===
+
+
+[discrete]
+==== Browser
+
+WARNING: There is no official support for the browser environment. It exposes
+your {es} instance to everyone, which could lead to security issues. We
+recommend you to write a lightweight proxy that uses this client instead,
+you can see a proxy example https://github.com/elastic/elasticsearch-js/tree/master/docs/examples/proxy[here].

docs/introduction.asciidoc

@@ -1,9 +1,11 @@
 [[introduction]]
 == Introduction
 
-The official Node.js client for {es}.
+This is the official Node.js client for {es}. This page gives a quick overview 
+about the features of the client.
 
 
+[discrete]
 === Features
 
 * One-to-one mapping with REST API.
@@ -15,55 +17,7 @@ The official Node.js client for {es}.
 * TypeScript support out of the box.
 
 
-=== Install
-
-[source,sh]
-----
-npm install @elastic/elasticsearch
-----
-
-
-=== Compatibility
-
-The minimum supported version of Node.js is `v8`.
-
-The library is compatible with all {es} versions since 5.x. We recommend you to
-use the same major version of the client as the {es} instance that you are
-using.
-
-
-[%header,cols=2*]
-|===
-|{es} Version
-|Client Version
-
-|`master`
-|`master`
-
-|`7.x`
-|`7.x`
-
-|`6.x`
-|`6.x`
-
-|`5.x`
-|`5.x`
-|===
-
-To install a specific major version of the client, run the following command:
-
-----
-npm install @elastic/elasticsearch@<major>
-----
-
-
-==== Browser
-
-WARNING: There is no official support for the browser environment. It exposes
-your {es} instance to everyone, which could lead to security issues. We
-recommend you to write a lightweight proxy that uses this client instead.
-
-
+[discrete]
 === Quick start
 
 First of all, require, then initialize the client:
@@ -176,7 +130,7 @@ async function run () {
 run().catch(console.log)
 ----
 
-
+[discrete]
 ==== Install multiple versions
 
 If you are using multiple versions of {es}, you need to use multiple versions of

docs/observability.asciidoc

@@ -11,6 +11,8 @@ a large codebase with many events happening at the same time.
 To help you with this, the client offers you a correlation id system and other 
 features. Let's see them in action.
 
+
+[discrete]
 === Events
 
 The client is an event emitter, this means that you can listen for its event and 
@@ -47,6 +49,15 @@ client.on('response', (err, result) => {
 The client emits the following events:
 [cols=2*]
 |===
+|`serialization`
+a|Emitted before starting serialization and compression. If you want to measure this phase duration, you should measure the time elapsed between this event and `request`.
+[source,js]
+----
+client.on('serialization', (err, result) => {
+  console.log(err, result)
+})
+----
+
 |`request`
 a|Emitted before sending the actual request to {es} _(emitted multiple times in case of retries)_.
 [source,js]
@@ -56,6 +67,15 @@ client.on('request', (err, result) => {
 })
 ----
 
+|`deserialization`
+a|Emitted before starting deserialization and decompression. If you want to measure this phase duration, you should measure the time elapsed between this event and `response`. _(This event might not be emitted in certain situations)_.
+[source,js]
+----
+client.on('deserialization', (err, result) => {
+  console.log(err, result)
+})
+----
+
 |`response`
 a|Emitted once {es} response has been received and parsed.
 [source,js]
@@ -85,7 +105,7 @@ client.on('resurrect', (err, result) => {
 
 |===
 
-The values of `result` in `request`, `response` and `sniff` will be:
+The values of `result` in `serialization`, `request`, `deserialization`, `response` and `sniff` will be:
 
 [source,ts]
 ----
@@ -125,7 +145,31 @@ request: {
 };
 ----
 
+[discrete]
+==== Events order
 
+The event order is described in the following graph, in some edge cases, the order is not guaranteed.
+You can find in https://github.com/elastic/elasticsearch-js/blob/master/test/acceptance/events-order.test.js[`test/acceptance/events-order.test.js`] how the order changes based on the situation.
+
+[source]
+----
+serialization
+  │
+  │ (serialization and compression happens between those two events)
+  │
+  └─▶ request
+        │
+        │ (actual time spent over the wire)
+        │
+        └─▶ deserialization
+              │
+              │ (deserialization and decompression happens between those two events)
+              │
+              └─▶ response
+----
+
+
+[discrete]
 === Correlation id
 
 Correlating events can be quite hard, especially if there are many events at the 
@@ -193,6 +237,7 @@ client.search({
 ----
 
 
+[discrete]
 === Context object
 
 Sometimes, you might need to make some custom data available in your events, you 
@@ -268,6 +313,7 @@ client.search({
 ----
 
 
+[discrete]
 === Client name
 
 If you are using multiple instances of the client or if you are using multiple 
@@ -321,6 +367,7 @@ child.search({
 ----
 
 
+[discrete]
 === X-Opaque-Id support
 
 To improve the overall observability, the client offers an easy way to configure 

docs/redirects.asciidoc

@@ -0,0 +1,9 @@
+"appendix",role="exclude",id="redirects"]
+= Deleted pages
+
+The following pages have moved or been deleted.
+
+[role="exclude",id="auth-reference"]
+== Authentication
+
+This page has moved. See <<authentication>>.

docs/testing.asciidoc

@@ -33,6 +33,8 @@ the `Connection` component since it has very few responsibilities and
 it does not interact with other internal components other than getting
 requests and returning responses.
 
+
+[discrete]
 === `@elastic/elasticsearch-mock`
 
 Writing each time a mock for your test can be annoying and error-prone,

docs/typescript.asciidoc

@@ -1,5 +1,4 @@
 [[typescript]]
-
 == TypeScript support
 
 The client offers a first-class support for TypeScript, since it ships the type 
@@ -39,6 +38,7 @@ console.log(response.body)
 You don't have to specify all the generics, but the order must be respected.
 
 
+[discrete]
 === A complete example
 
 [source,ts]

index.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /// <reference types="node" />
 
@@ -92,6 +107,8 @@ interface ClientOptions {
   name?: string | symbol;
   auth?: BasicAuth | ApiKeyAuth;
   context?: Context;
+  proxy?: string | URL;
+  enableMetaHeader?: boolean;
   cloud?: {
     id: string;
     // TODO: remove username and password here in 8
@@ -132,6 +149,10 @@ declare class Client {
     get<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchGet, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchGet, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchStatus, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    status<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchStatus, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchStatus, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchSubmit<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchSubmit<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -146,6 +167,10 @@ declare class Client {
     get<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchGet, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchGet, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchStatus, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    status<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchStatus, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    status<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchStatus, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.AsyncSearchSubmit<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     submit<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.AsyncSearchSubmit<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -160,14 +185,14 @@ declare class Client {
     deleteAutoscalingPolicy<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     deleteAutoscalingPolicy<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingDeleteAutoscalingPolicy, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     deleteAutoscalingPolicy<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingDeleteAutoscalingPolicy, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    get_autoscaling_decision<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingDecision, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    get_autoscaling_decision<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    get_autoscaling_decision<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingDecision, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    get_autoscaling_decision<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingDecision, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    getAutoscalingDecision<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingDecision, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    getAutoscalingDecision<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    getAutoscalingDecision<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingDecision, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    getAutoscalingDecision<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingDecision, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    get_autoscaling_capacity<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingCapacity, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    get_autoscaling_capacity<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    get_autoscaling_capacity<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingCapacity, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    get_autoscaling_capacity<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingCapacity, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    getAutoscalingCapacity<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingCapacity, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    getAutoscalingCapacity<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    getAutoscalingCapacity<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingCapacity, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    getAutoscalingCapacity<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingCapacity, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get_autoscaling_policy<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.AutoscalingGetAutoscalingPolicy, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     get_autoscaling_policy<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     get_autoscaling_policy<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.AutoscalingGetAutoscalingPolicy, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -417,6 +442,14 @@ declare class Client {
   clearScroll<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   clearScroll<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClearScroll<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   clearScroll<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClearScroll<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  close_point_in_time<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClosePointInTime<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+  close_point_in_time<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  close_point_in_time<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClosePointInTime<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  close_point_in_time<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClosePointInTime<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  closePointInTime<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClosePointInTime<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+  closePointInTime<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  closePointInTime<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClosePointInTime<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  closePointInTime<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.ClosePointInTime<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   cluster: {
     allocation_explain<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.ClusterAllocationExplain<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     allocation_explain<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1012,10 +1045,26 @@ declare class Client {
     getUpgrade<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     getUpgrade<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesGetUpgrade, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     getUpgrade<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesGetUpgrade, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrate_to_data_stream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesMigrateToDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    migrate_to_data_stream<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrate_to_data_stream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesMigrateToDataStream, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrate_to_data_stream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesMigrateToDataStream, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrateToDataStream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesMigrateToDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    migrateToDataStream<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrateToDataStream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesMigrateToDataStream, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    migrateToDataStream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesMigrateToDataStream, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     open<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesOpen, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     open<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     open<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesOpen, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     open<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesOpen, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promote_data_stream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPromoteDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    promote_data_stream<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promote_data_stream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesPromoteDataStream, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promote_data_stream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesPromoteDataStream, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promoteDataStream<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPromoteDataStream, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    promoteDataStream<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promoteDataStream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesPromoteDataStream, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    promoteDataStream<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.IndicesPromoteDataStream, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     put_alias<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.IndicesPutAlias<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     put_alias<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     put_alias<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.IndicesPutAlias<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1656,14 +1705,14 @@ declare class Client {
     stopDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     stopDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDataFrameAnalytics<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     stopDataFrameAnalytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDataFrameAnalytics<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stop_datafeed<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    stop_datafeed<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stop_datafeed<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stop_datafeed<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stopDatafeed<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
-    stopDatafeed<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stopDatafeed<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
-    stopDatafeed<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stop_datafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    stop_datafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stop_datafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stop_datafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stopDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlStopDatafeed<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    stopDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stopDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    stopDatafeed<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlStopDatafeed<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     update_data_frame_analytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpdateDataFrameAnalytics<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     update_data_frame_analytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     update_data_frame_analytics<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlUpdateDataFrameAnalytics<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1704,6 +1753,14 @@ declare class Client {
     updateModelSnapshot<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     updateModelSnapshot<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlUpdateModelSnapshot<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     updateModelSnapshot<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlUpdateModelSnapshot<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgrade_job_snapshot<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpgradeJobSnapshot, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    upgrade_job_snapshot<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgrade_job_snapshot<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlUpgradeJobSnapshot, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgrade_job_snapshot<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlUpgradeJobSnapshot, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgradeJobSnapshot<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.MlUpgradeJobSnapshot, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    upgradeJobSnapshot<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgradeJobSnapshot<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlUpgradeJobSnapshot, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    upgradeJobSnapshot<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.MlUpgradeJobSnapshot, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     validate<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.MlValidate<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     validate<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     validate<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.MlValidate<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1769,6 +1826,14 @@ declare class Client {
     usage<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.NodesUsage, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     usage<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.NodesUsage, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   }
+  open_point_in_time<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.OpenPointInTime, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+  open_point_in_time<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  open_point_in_time<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.OpenPointInTime, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  open_point_in_time<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.OpenPointInTime, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  openPointInTime<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.OpenPointInTime, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+  openPointInTime<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  openPointInTime<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.OpenPointInTime, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+  openPointInTime<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.OpenPointInTime, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   ping<TResponse = boolean, TContext = Context>(params?: RequestParams.Ping, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
   ping<TResponse = boolean, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
   ping<TResponse = boolean, TContext = Context>(params: RequestParams.Ping, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1850,6 +1915,10 @@ declare class Client {
     putJob<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     putJob<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.RollupPutJob<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     putJob<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.RollupPutJob<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    rollup<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RollupRollup<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    rollup<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    rollup<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.RollupRollup<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    rollup<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.RollupRollup<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     rollup_search<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.RollupRollupSearch<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     rollup_search<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     rollup_search<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.RollupRollupSearch<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -1972,6 +2041,14 @@ declare class Client {
     changePassword<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     changePassword<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityChangePassword<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     changePassword<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityChangePassword<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clear_api_key_cache<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearApiKeyCache, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    clear_api_key_cache<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clear_api_key_cache<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityClearApiKeyCache, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clear_api_key_cache<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityClearApiKeyCache, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clearApiKeyCache<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearApiKeyCache, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    clearApiKeyCache<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clearApiKeyCache<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityClearApiKeyCache, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clearApiKeyCache<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityClearApiKeyCache, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     clear_cached_privileges<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityClearCachedPrivileges, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     clear_cached_privileges<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     clear_cached_privileges<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityClearCachedPrivileges, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -2116,6 +2193,14 @@ declare class Client {
     getUserPrivileges<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     getUserPrivileges<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGetUserPrivileges, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     getUserPrivileges<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGetUserPrivileges, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grant_api_key<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGrantApiKey<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    grant_api_key<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grant_api_key<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGrantApiKey<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grant_api_key<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGrantApiKey<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grantApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityGrantApiKey<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    grantApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grantApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGrantApiKey<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    grantApiKey<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityGrantApiKey<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     has_privileges<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SecurityHasPrivileges<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     has_privileges<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     has_privileges<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SecurityHasPrivileges<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -2248,6 +2333,10 @@ declare class Client {
     cleanupRepository<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     cleanupRepository<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SnapshotCleanupRepository, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     cleanupRepository<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.SnapshotCleanupRepository, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clone<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotClone<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    clone<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clone<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SnapshotClone<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    clone<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SnapshotClone<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     create<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.SnapshotCreate<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     create<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     create<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.SnapshotCreate<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -2486,6 +2575,14 @@ declare class Client {
     putWatch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     putWatch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherPutWatch<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     putWatch<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherPutWatch<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    query_watches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherQueryWatches<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    query_watches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    query_watches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherQueryWatches<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    query_watches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherQueryWatches<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    queryWatches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherQueryWatches<TRequestBody>, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
+    queryWatches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    queryWatches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherQueryWatches<TRequestBody>, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
+    queryWatches<TResponse = Record<string, any>, TRequestBody extends RequestBody = Record<string, any>, TContext = Context>(params: RequestParams.WatcherQueryWatches<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     start<TResponse = Record<string, any>, TContext = Context>(params?: RequestParams.WatcherStart, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<TResponse, TContext>>
     start<TResponse = Record<string, any>, TContext = Context>(callback: callbackFn<TResponse, TContext>): TransportRequestCallback
     start<TResponse = Record<string, any>, TContext = Context>(params: RequestParams.WatcherStart, callback: callbackFn<TResponse, TContext>): TransportRequestCallback
@@ -2513,8 +2610,10 @@ declare class Client {
 }
 
 declare const events: {
-  RESPONSE: string;
+  SERIALIZATION: string;
   REQUEST: string;
+  DESERIALIZATION: string;
+  RESPONSE: string;
   SNIFF: string;
   RESURRECT: string;
 };

index.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -18,6 +33,8 @@ const Serializer = require('./lib/Serializer')
 const errors = require('./lib/errors')
 const { ConfigurationError } = errors
 const { prepareHeaders } = Connection.internals
+const clientVersion = require('./package.json').version
+const nodeVersion = process.versions.node
 
 const kInitialOptions = Symbol('elasticsearchjs-initial-options')
 const kChild = Symbol('elasticsearchjs-child')
@@ -26,6 +43,24 @@ const kEventEmitter = Symbol('elasticsearchjs-event-emitter')
 
 const ESAPI = require('./api')
 
+/* istanbul ignore next */
+if (nodeMajor < 10) {
+  process.emitWarning('You are using a version of Node.js that is currently in EOL. ' +
+                      'The support for this version will be dropped in 7.12. ' +
+                      'Please refer to https://ela.st/nodejs-support for additional information.',
+  'DeprecationWarning'
+  )
+}
+
+/* istanbul ignore next */
+if (nodeMajor >= 10 && nodeMajor < 12) {
+  process.emitWarning('You are using a version of Node.js that will reach EOL in April 2021. ' +
+                      'The support for this version will be dropped in 7.13. ' +
+                      'Please refer to https://ela.st/nodejs-support for additional information.',
+  'DeprecationWarning'
+  )
+}
+
 class Client extends ESAPI {
   constructor (opts = {}) {
     super({ ConfigurationError })
@@ -91,13 +126,19 @@ class Client extends ESAPI {
         name: 'elasticsearch-js',
         auth: null,
         opaqueIdPrefix: null,
-        context: null
+        context: null,
+        proxy: null,
+        enableMetaHeader: true
       }, opts)
 
     this[kInitialOptions] = options
     this[kExtensions] = []
     this.name = options.name
 
+    if (options.enableMetaHeader) {
+      options.headers['x-elastic-client-meta'] = `es=${clientVersion},js=${nodeVersion},t=${clientVersion},hc=${nodeVersion}`
+    }
+
     if (opts[kChild] !== undefined) {
       this.serializer = options[kChild].serializer
       this.connectionPool = options[kChild].connectionPool
@@ -110,6 +151,7 @@ class Client extends ESAPI {
         resurrectStrategy: options.resurrectStrategy,
         ssl: options.ssl,
         agent: options.agent,
+        proxy: options.proxy,
         Connection: options.Connection,
         auth: options.auth,
         emit: this[kEventEmitter].emit.bind(this[kEventEmitter]),
@@ -144,7 +186,13 @@ class Client extends ESAPI {
 
     /* istanbul ignore else */
     if (Helpers !== null) {
-      this.helpers = new Helpers({ client: this, maxRetries: options.maxRetries })
+      this.helpers = new Helpers({
+        client: this,
+        maxRetries: options.maxRetries,
+        metaHeader: options.enableMetaHeader
+          ? `es=${clientVersion},js=${nodeVersion},t=${clientVersion},hc=${nodeVersion}`
+          : null
+      })
     }
   }
 
@@ -279,7 +327,9 @@ const events = {
   RESPONSE: 'response',
   REQUEST: 'request',
   SNIFF: 'sniff',
-  RESURRECT: 'resurrect'
+  RESURRECT: 'resurrect',
+  SERIALIZATION: 'serialization',
+  DESERIALIZATION: 'deserialization'
 }
 
 module.exports = {

index.mjs

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import mod from './index.js'
 
 export default mod

lib/Connection.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /// <reference types="node" />
 
@@ -9,11 +24,13 @@ import { inspect, InspectOptions } from 'util'
 import { Readable as ReadableStream } from 'stream';
 import { ApiKeyAuth, BasicAuth } from './pool'
 import * as http from 'http'
+import * as https from 'https'
+import * as hpagent from 'hpagent'
 import { ConnectionOptions as TlsConnectionOptions } from 'tls'
 
-export declare type agentFn = () => any;
+export declare type agentFn = (opts: ConnectionOptions) => any;
 
-interface ConnectionOptions {
+export interface ConnectionOptions {
   url: URL;
   ssl?: TlsConnectionOptions;
   id?: string;
@@ -22,6 +39,7 @@ interface ConnectionOptions {
   status?: string;
   roles?: ConnectionRoles;
   auth?: BasicAuth | ApiKeyAuth;
+  proxy?: string | URL;
 }
 
 interface ConnectionRoles {
@@ -66,7 +84,7 @@ export default class Connection {
   makeRequest: any
   _openRequests: number
   _status: string
-  _agent: http.Agent
+  _agent: http.Agent | https.Agent | hpagent.HttpProxyAgent | hpagent.HttpsProxyAgent
   constructor(opts?: ConnectionOptions)
   request(params: RequestOptions, callback: (err: Error | null, response: http.IncomingMessage | null) => void): http.ClientRequest
   close(): Connection

lib/Connection.js

@@ -1,15 +1,30 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
 const assert = require('assert')
 const { inspect } = require('util')
+const hpagent = require('hpagent')
 const http = require('http')
 const https = require('https')
 const debug = require('debug')('elasticsearch')
-const decompressResponse = require('decompress-response')
 const pump = require('pump')
 const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/
 const {
@@ -37,7 +52,7 @@ class Connection {
     }
 
     if (typeof opts.agent === 'function') {
-      this.agent = opts.agent()
+      this.agent = opts.agent(opts)
     } else if (opts.agent === false) {
       this.agent = undefined
     } else {
@@ -48,9 +63,16 @@ class Connection {
         maxFreeSockets: 256,
         scheduling: 'lifo'
       }, opts.agent)
-      this.agent = this.url.protocol === 'http:'
-        ? new http.Agent(agentOptions)
-        : new https.Agent(Object.assign({}, agentOptions, this.ssl))
+      if (opts.proxy) {
+        agentOptions.proxy = opts.proxy
+        this.agent = this.url.protocol === 'http:'
+          ? new hpagent.HttpProxyAgent(agentOptions)
+          : new hpagent.HttpsProxyAgent(Object.assign({}, agentOptions, this.ssl))
+      } else {
+        this.agent = this.url.protocol === 'http:'
+          ? new http.Agent(agentOptions)
+          : new https.Agent(Object.assign({}, agentOptions, this.ssl))
+      }
     }
 
     this.makeRequest = this.url.protocol === 'http:'
@@ -60,7 +82,7 @@ class Connection {
 
   request (params, callback) {
     this._openRequests++
-    var ended = false
+    let cleanedListeners = false
 
     const requestParams = this.buildRequestObject(params)
     // https://github.com/nodejs/node/commit/b961d9fd83
@@ -73,53 +95,38 @@ class Connection {
     debug('Starting a new request', params)
     const request = this.makeRequest(requestParams)
 
-    // listen for the response event
-    // TODO: handle redirects?
-    request.on('response', response => {
-      /* istanbul ignore else */
-      if (ended === false) {
-        ended = true
-        this._openRequests--
+    const onResponse = response => {
+      cleanListeners()
+      this._openRequests--
+      callback(null, response)
+    }
 
-        if (params.asStream === true) {
-          callback(null, response)
-        } else {
-          callback(null, decompressResponse(response))
-        }
-      }
-    })
+    const onTimeout = () => {
+      cleanListeners()
+      this._openRequests--
+      request.once('error', () => {}) // we need to catch the request aborted error
+      request.abort()
+      callback(new TimeoutError('Request timed out', params), null)
+    }
 
-    // handles request timeout
-    request.on('timeout', () => {
-      /* istanbul ignore else */
-      if (ended === false) {
-        ended = true
-        this._openRequests--
-        request.abort()
-        callback(new TimeoutError('Request timed out', params), null)
-      }
-    })
+    const onError = err => {
+      cleanListeners()
+      this._openRequests--
+      callback(new ConnectionError(err.message), null)
+    }
 
-    // handles request error
-    request.on('error', err => {
-      /* istanbul ignore else */
-      if (ended === false) {
-        ended = true
-        this._openRequests--
-        callback(new ConnectionError(err.message), null)
-      }
-    })
-
-    // updates the ended state
-    request.on('abort', () => {
+    const onAbort = () => {
+      cleanListeners()
+      request.once('error', () => {}) // we need to catch the request aborted error
       debug('Request aborted', params)
-      /* istanbul ignore else */
-      if (ended === false) {
-        ended = true
-        this._openRequests--
-        callback(new RequestAbortedError(), null)
-      }
-    })
+      this._openRequests--
+      callback(new RequestAbortedError(), null)
+    }
+
+    request.on('response', onResponse)
+    request.on('timeout', onTimeout)
+    request.on('error', onError)
+    request.on('abort', onAbort)
 
     // Disables the Nagle algorithm
     request.setNoDelay(true)
@@ -128,8 +135,8 @@ class Connection {
     if (isStream(params.body) === true) {
       pump(params.body, request, err => {
         /* istanbul ignore if  */
-        if (err != null && /* istanbul ignore next */ ended === false) {
-          ended = true
+        if (err != null && cleanedListeners === false) {
+          cleanListeners()
           this._openRequests--
           callback(err, null)
         }
@@ -139,6 +146,14 @@ class Connection {
     }
 
     return request
+
+    function cleanListeners () {
+      request.removeListener('response', onResponse)
+      request.removeListener('timeout', onTimeout)
+      request.removeListener('error', onError)
+      request.removeListener('abort', onAbort)
+      cleanedListeners = true
+    }
   }
 
   // TODO: write a better closing logic

lib/Helpers.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { Readable as ReadableStream } from 'stream'
 import { TransportRequestOptions, ApiError, ApiResponse, RequestBody, Context } from './Transport'

lib/Helpers.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -13,12 +28,14 @@ const { ResponseError, ConfigurationError } = require('./errors')
 const pImmediate = promisify(setImmediate)
 const sleep = promisify(setTimeout)
 const kClient = Symbol('elasticsearch-client')
+const kMetaHeader = Symbol('meta header')
 /* istanbul ignore next */
 const noop = () => {}
 
 class Helpers {
   constructor (opts) {
     this[kClient] = opts.client
+    this[kMetaHeader] = opts.metaHeader
     this.maxRetries = opts.maxRetries
   }
 
@@ -56,6 +73,10 @@ class Helpers {
    * @return {iterator} the async iterator
    */
   async * scrollSearch (params, options = {}) {
+    if (this[kMetaHeader] !== null) {
+      options.headers = options.headers || {}
+      options.headers['x-elastic-client-meta'] = this[kMetaHeader] + ',h=s'
+    }
     // TODO: study scroll search slices
     const wait = options.wait || 5000
     const maxRetries = options.maxRetries || this.maxRetries
@@ -84,18 +105,20 @@ class Helpers {
       stop = true
       await this[kClient].clearScroll(
         { body: { scroll_id } },
-        { ignore: [400] }
+        { ignore: [400], ...options }
       )
     }
 
     while (response.body.hits && response.body.hits.hits.length > 0) {
+      // scroll id is always present in the response, but it might
+      // change over time based on the number of shards
       scroll_id = response.body._scroll_id
       response.clear = clear
       addDocumentsGetter(response)
 
       yield response
 
-      if (!scroll_id || stop === true) {
+      if (stop === true) {
         break
       }
 
@@ -112,6 +135,10 @@ class Helpers {
         throw new ResponseError(response)
       }
     }
+
+    if (stop === false) {
+      await clear()
+    }
   }
 
   /**
@@ -393,6 +420,7 @@ class Helpers {
   bulk (options) {
     const client = this[kClient]
     const { serialize, deserialize } = client.serializer
+    const reqOptions = this[kMetaHeader] !== null ? { headers: { 'x-elastic-client-meta': this[kMetaHeader] + ',h=bp' } } : {}
     const {
       datasource,
       onDocument,
@@ -655,7 +683,7 @@ class Helpers {
 
       function tryBulk (bulkBody, callback) {
         if (shouldAbort === true) return callback(null, [])
-        client.bulk(Object.assign({}, bulkOptions, { body: bulkBody }), (err, { body }) => {
+        client.bulk(Object.assign({}, bulkOptions, { body: bulkBody }), reqOptions, (err, { body }) => {
           if (err) return callback(err, null)
           if (body.errors === false) {
             stats.successful += body.items.length

lib/Serializer.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 export default class Serializer {
   serialize(object: any): string;

lib/Serializer.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

lib/Transport.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { Readable as ReadableStream } from 'stream';
 import { ConnectionPool, CloudConnectionPool } from './pool';

lib/Transport.js

@@ -1,12 +1,28 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
 const debug = require('debug')('elasticsearch')
 const os = require('os')
-const { gzip, createGzip } = require('zlib')
+const { gzip, unzip, createGzip } = require('zlib')
+const buffer = require('buffer')
 const ms = require('ms')
 const {
   ConnectionError,
@@ -20,12 +36,15 @@ const noop = () => {}
 
 const clientVersion = require('../package.json').version
 const userAgent = `elasticsearch-js/${clientVersion} (${os.platform()} ${os.release()}-${os.arch()}; Node.js ${process.version})`
+const MAX_BUFFER_LENGTH = buffer.constants.MAX_LENGTH
+const MAX_STRING_LENGTH = buffer.constants.MAX_STRING_LENGTH
 
 class Transport {
   constructor (opts) {
     if (typeof opts.compression === 'string' && opts.compression !== 'gzip') {
       throw new ConfigurationError(`Invalid compression: '${opts.compression}'`)
     }
+
     this.emit = opts.emit
     this.connectionPool = opts.connectionPool
     this.serializer = opts.serializer
@@ -159,37 +178,40 @@ class Transport {
       request = meta.connection.request(params, onResponse)
     }
 
-    const onResponse = (err, response) => {
-      if (err !== null) {
-        if (err.name !== 'RequestAbortedError') {
-          // if there is an error in the connection
-          // let's mark the connection as dead
-          this.connectionPool.markDead(meta.connection)
+    const onConnectionError = (err) => {
+      if (err.name !== 'RequestAbortedError') {
+        // if there is an error in the connection
+        // let's mark the connection as dead
+        this.connectionPool.markDead(meta.connection)
 
-          if (this.sniffOnConnectionFault === true) {
-            this.sniff({
-              reason: Transport.sniffReasons.SNIFF_ON_CONNECTION_FAULT,
-              requestId: meta.request.id
-            })
-          }
-
-          // retry logic
-          if (meta.attempts < maxRetries) {
-            meta.attempts++
-            debug(`Retrying request, there are still ${maxRetries - meta.attempts} attempts`, params)
-            makeRequest()
-            return
-          }
+        if (this.sniffOnConnectionFault === true) {
+          this.sniff({
+            reason: Transport.sniffReasons.SNIFF_ON_CONNECTION_FAULT,
+            requestId: meta.request.id
+          })
         }
 
-        err.meta = result
-        this.emit('response', err, result)
-        return callback(err, result)
+        // retry logic
+        if (meta.attempts < maxRetries) {
+          meta.attempts++
+          debug(`Retrying request, there are still ${maxRetries - meta.attempts} attempts`, params)
+          makeRequest()
+          return
+        }
       }
 
-      const { statusCode, headers } = response
-      result.statusCode = statusCode
-      result.headers = headers
+      err.meta = result
+      this.emit('response', err, result)
+      return callback(err, result)
+    }
+
+    const onResponse = (err, response) => {
+      if (err !== null) {
+        return onConnectionError(err)
+      }
+
+      result.statusCode = response.statusCode
+      result.headers = response.headers
 
       if (options.asStream === true) {
         result.body = response
@@ -198,76 +220,130 @@ class Transport {
         return
       }
 
-      var payload = ''
-      // collect the payload
-      response.setEncoding('utf8')
-      response.on('data', chunk => { payload += chunk })
-      /* istanbul ignore next */
-      response.on('error', err => {
-        const error = new ConnectionError(err.message, result)
-        this.emit('response', error, result)
-        callback(error, result)
-      })
-      response.on('end', () => {
-        const isHead = params.method === 'HEAD'
-        // we should attempt the payload deserialization only if:
-        //    - a `content-type` is defined and is equal to `application/json`
-        //    - the request is not a HEAD request
-        //    - the payload is not an empty string
-        if (headers['content-type'] !== undefined &&
-            headers['content-type'].indexOf('application/json') > -1 &&
-            isHead === false &&
-            payload !== ''
-        ) {
-          try {
-            result.body = this.serializer.deserialize(payload)
-          } catch (err) {
-            this.emit('response', err, result)
-            return callback(err, result)
-          }
-        } else {
-          // cast to boolean if the request method was HEAD
-          result.body = isHead === true ? true : payload
+      const contentEncoding = (result.headers['content-encoding'] || '').toLowerCase()
+      const isCompressed = contentEncoding.indexOf('gzip') > -1 || contentEncoding.indexOf('deflate') > -1
+
+      /* istanbul ignore else */
+      if (result.headers['content-length'] !== undefined) {
+        const contentLength = Number(result.headers['content-length'])
+        if (isCompressed && contentLength > MAX_BUFFER_LENGTH) {
+          response.destroy()
+          return onConnectionError(
+            new RequestAbortedError(`The content length (${contentLength}) is bigger than the maximum allowed buffer (${MAX_BUFFER_LENGTH})`, result)
+          )
+        } else if (contentLength > MAX_STRING_LENGTH) {
+          response.destroy()
+          return onConnectionError(
+            new RequestAbortedError(`The content length (${contentLength}) is bigger than the maximum allowed string (${MAX_STRING_LENGTH})`, result)
+          )
+        }
+      }
+      // if the response is compressed, we must handle it
+      // as buffer for allowing decompression later
+      let payload = isCompressed ? [] : ''
+      const onData = isCompressed
+        ? chunk => { payload.push(chunk) }
+        : chunk => { payload += chunk }
+      const onEnd = err => {
+        response.removeListener('data', onData)
+        response.removeListener('end', onEnd)
+        response.removeListener('error', onEnd)
+        response.removeListener('aborted', onAbort)
+
+        if (err) {
+          return onConnectionError(new ConnectionError(err.message))
         }
 
-        // we should ignore the statusCode if the user has configured the `ignore` field with
-        // the statusCode we just got or if the request method is HEAD and the statusCode is 404
-        const ignoreStatusCode = (Array.isArray(options.ignore) && options.ignore.indexOf(statusCode) > -1) ||
-          (isHead === true && statusCode === 404)
-
-        if (ignoreStatusCode === false &&
-           (statusCode === 502 || statusCode === 503 || statusCode === 504)) {
-          // if the statusCode is 502/3/4 we should run our retry strategy
-          // and mark the connection as dead
-          this.connectionPool.markDead(meta.connection)
-          // retry logic (we shoukd not retry on "429 - Too Many Requests")
-          if (meta.attempts < maxRetries && statusCode !== 429) {
-            meta.attempts++
-            debug(`Retrying request, there are still ${maxRetries - meta.attempts} attempts`, params)
-            makeRequest()
-            return
-          }
+        if (isCompressed) {
+          unzip(Buffer.concat(payload), onBody)
         } else {
-          // everything has worked as expected, let's mark
-          // the connection as alive (or confirm it)
-          this.connectionPool.markAlive(meta.connection)
+          onBody(null, payload)
         }
+      }
 
-        if (ignoreStatusCode === false && statusCode >= 400) {
-          const error = new ResponseError(result)
-          this.emit('response', error, result)
-          callback(error, result)
-        } else {
-          // cast to boolean if the request method was HEAD
-          if (isHead === true && statusCode === 404) {
-            result.body = false
-          }
-          this.emit('response', null, result)
-          callback(null, result)
-        }
-      })
+      const onAbort = () => {
+        response.destroy()
+        onEnd(new Error('Response aborted while reading the body'))
+      }
+
+      if (!isCompressed) {
+        response.setEncoding('utf8')
+      }
+
+      this.emit('deserialization', null, result)
+      response.on('data', onData)
+      response.on('error', onEnd)
+      response.on('end', onEnd)
+      response.on('aborted', onAbort)
     }
 
+    const onBody = (err, payload) => {
+      if (err) {
+        this.emit('response', err, result)
+        return callback(err, result)
+      }
+      if (Buffer.isBuffer(payload)) {
+        payload = payload.toString()
+      }
+      const isHead = params.method === 'HEAD'
+      // we should attempt the payload deserialization only if:
+      //    - a `content-type` is defined and is equal to `application/json`
+      //    - the request is not a HEAD request
+      //    - the payload is not an empty string
+      if (result.headers['content-type'] !== undefined &&
+          result.headers['content-type'].indexOf('application/json') > -1 &&
+          isHead === false &&
+          payload !== ''
+      ) {
+        try {
+          result.body = this.serializer.deserialize(payload)
+        } catch (err) {
+          this.emit('response', err, result)
+          return callback(err, result)
+        }
+      } else {
+        // cast to boolean if the request method was HEAD
+        result.body = isHead === true ? true : payload
+      }
+
+      // we should ignore the statusCode if the user has configured the `ignore` field with
+      // the statusCode we just got or if the request method is HEAD and the statusCode is 404
+      const ignoreStatusCode = (Array.isArray(options.ignore) && options.ignore.indexOf(result.statusCode) > -1) ||
+        (isHead === true && result.statusCode === 404)
+
+      if (ignoreStatusCode === false &&
+         (result.statusCode === 502 || result.statusCode === 503 || result.statusCode === 504)) {
+        // if the statusCode is 502/3/4 we should run our retry strategy
+        // and mark the connection as dead
+        this.connectionPool.markDead(meta.connection)
+        // retry logic (we shoukd not retry on "429 - Too Many Requests")
+        if (meta.attempts < maxRetries && result.statusCode !== 429) {
+          meta.attempts++
+          debug(`Retrying request, there are still ${maxRetries - meta.attempts} attempts`, params)
+          makeRequest()
+          return
+        }
+      } else {
+        // everything has worked as expected, let's mark
+        // the connection as alive (or confirm it)
+        this.connectionPool.markAlive(meta.connection)
+      }
+
+      if (ignoreStatusCode === false && result.statusCode >= 400) {
+        const error = new ResponseError(result)
+        this.emit('response', error, result)
+        callback(error, result)
+      } else {
+        // cast to boolean if the request method was HEAD
+        if (isHead === true && result.statusCode === 404) {
+          result.body = false
+        }
+        this.emit('response', null, result)
+        callback(null, result)
+      }
+    }
+
+    this.emit('serialization', null, result)
     const headers = Object.assign({}, this.headers, lowerCaseHeaders(options.headers))
 
     if (options.opaqueId !== undefined) {
@@ -282,6 +358,7 @@ class Transport {
         try {
           params.body = this.serializer.serialize(params.body)
         } catch (err) {
+          this.emit('request', err, result)
           process.nextTick(callback, err, result)
           return transportReturn
         }
@@ -297,6 +374,7 @@ class Transport {
         try {
           params.body = this.serializer.ndserialize(params.bulkBody)
         } catch (err) {
+          this.emit('request', err, result)
           process.nextTick(callback, err, result)
           return transportReturn
         }
@@ -336,6 +414,7 @@ class Transport {
         gzip(params.body, (err, buffer) => {
           /* istanbul ignore next */
           if (err) {
+            this.emit('request', err, result)
             return callback(err, result)
           }
           params.headers['content-encoding'] = compression

lib/errors.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { ApiResponse, Context } from './Transport'
 

lib/errors.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

lib/pool/BaseConnectionPool.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -20,6 +35,7 @@ class BaseConnectionPool {
     this.auth = opts.auth || null
     this._ssl = opts.ssl
     this._agent = opts.agent
+    this._proxy = opts.proxy || null
   }
 
   getConnection () {
@@ -54,6 +70,8 @@ class BaseConnectionPool {
     if (opts.ssl == null) opts.ssl = this._ssl
     /* istanbul ignore else */
     if (opts.agent == null) opts.agent = this._agent
+    /* istanbul ignore else */
+    if (opts.proxy == null) opts.proxy = this._proxy
 
     const connection = new this.Connection(opts)
 

lib/pool/CloudConnectionPool.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

lib/pool/ConnectionPool.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

lib/pool/index.d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /// <reference types="node" />
 
@@ -12,6 +27,7 @@ import { nodeFilterFn, nodeSelectorFn } from '../Transport';
 interface BaseConnectionPoolOptions {
   ssl?: SecureContextOptions;
   agent?: AgentOptions;
+  proxy?: string | URL;
   auth?: BasicAuth | ApiKeyAuth;
   emit: (event: string | symbol, ...args: any[]) => boolean;
   Connection: typeof Connection;
@@ -68,6 +84,7 @@ declare class BaseConnectionPool {
   emit: (event: string | symbol, ...args: any[]) => boolean;
   _ssl: SecureContextOptions | null;
   _agent: AgentOptions | null;
+  _proxy: string | URL;
   auth: BasicAuth | ApiKeyAuth;
   Connection: typeof Connection;
   constructor(opts?: BaseConnectionPoolOptions);

lib/pool/index.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

package.json

@@ -11,7 +11,7 @@
     "./": "./"
   },
   "homepage": "http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "7.9.1",
+  "version": "7.11.0",
   "keywords": [
     "elasticsearch",
     "elastic",
@@ -60,6 +60,7 @@
     "minimist": "^1.2.0",
     "ora": "^3.4.0",
     "pretty-hrtime": "^1.0.3",
+    "proxy": "^1.0.2",
     "rimraf": "^2.6.3",
     "semver": "^6.0.0",
     "simple-git": "^1.110.0",
@@ -74,7 +75,7 @@
   },
   "dependencies": {
     "debug": "^4.1.1",
-    "decompress-response": "^4.2.0",
+    "hpagent": "^0.1.1",
     "ms": "^2.1.1",
     "pump": "^3.0.0",
     "secure-json-parse": "^2.1.0"

scripts/generate.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

scripts/utils/clone-es.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

scripts/utils/generateApis.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /* eslint camelcase: 0 */
 
@@ -441,9 +456,9 @@ function genBody (api, methods, body) {
     return 'bulkBody: body,'
   }
   if (body === null && bodyMethod) {
-    return `body: '',`
+    return 'body: \'\','
   } else if (bodyMethod) {
-    return `body: body || '',`
+    return 'body: body || \'\','
   } else {
     return 'body: null,'
   }

scripts/utils/generateDocs.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -96,6 +111,7 @@ function generateDocs (common, spec) {
 
 function commonParameters (spec) {
   var doc = dedent`
+  [discrete]
   === Common parameters
   Parameters that are accepted by all API endpoints.
 
@@ -195,6 +211,7 @@ function generateApiDoc (spec) {
     : `*Stability:* ${spec[name].stability}`
 
   var doc = dedent`
+  [discrete]
   === ${camelify(name)}
   ${stability}
   [source,ts]
@@ -222,7 +239,7 @@ function generateApiDoc (spec) {
         acc += ` +\n_Default:_ ${'`' + val.default + '`'}`
       }
       if (val.deprecated) {
-        acc += ` +\n\nWARNING: This parameter has been deprecated.`
+        acc += ' +\n\nWARNING: This parameter has been deprecated.'
       }
       return acc + '\n\n'
     }, '')

scripts/utils/generateMain.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /* eslint-disable no-template-curly-in-string  */
 
@@ -158,9 +173,24 @@ function genFactory (folder, paths, namespaces) {
   }
 
   const fn = dedent`
-  // Licensed to Elasticsearch B.V under one or more agreements.
-  // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-  // See the LICENSE file in the project root for more information
+  /*
+   * Licensed to Elasticsearch B.V. under one or more contributor
+   * license agreements. See the NOTICE file distributed with
+   * this work for additional information regarding copyright
+   * ownership. Elasticsearch B.V. licenses this file to you under
+   * the Apache License, Version 2.0 (the "License"); you may
+   * not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   *    http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing,
+   * software distributed under the License is distributed on an
+   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   * KIND, either express or implied.  See the License for the
+   * specific language governing permissions and limitations
+   * under the License.
+   */
 
   'use strict'
 

scripts/utils/generateRequestTypes.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -18,9 +33,24 @@ const ndjsonApiKey = ndjsonApi
 
 function generate (version, api) {
   const release = semver.valid(version) ? semver.major(version) : version
-  var types = `// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  var types = `/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { RequestBody, RequestNDBody } from '../lib/Transport'
 

scripts/utils/index.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/acceptance/events-order.test.js

@@ -0,0 +1,462 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const { test } = require('tap')
+const intoStream = require('into-stream')
+const { Client, Connection, events } = require('../../index')
+const {
+  TimeoutError,
+  ConnectionError,
+  ResponseError,
+  RequestAbortedError,
+  SerializationError,
+  DeserializationError
+} = require('../../lib/errors')
+const {
+  buildServer,
+  connection: {
+    MockConnection,
+    MockConnectionError,
+    MockConnectionTimeout,
+    buildMockConnection
+  }
+} = require('../utils')
+
+test('No errors', t => {
+  t.plan(10)
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnection
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.DESERIALIZATION,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.DESERIALIZATION)
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.error(err)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('Connection error', t => {
+  t.plan(10)
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnectionError,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.REQUEST,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (_err, request) => {
+    t.fail('Should not be called')
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof ConnectionError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.ok(err instanceof ConnectionError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('TimeoutError error', t => {
+  t.plan(10)
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnectionTimeout,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.REQUEST,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (_err, request) => {
+    t.fail('Should not be called')
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof TimeoutError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.ok(err instanceof TimeoutError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('RequestAbortedError error', t => {
+  t.plan(8)
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnectionTimeout,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (_err, request) => {
+    t.fail('Should not be called')
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof RequestAbortedError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  const request = client.info((err, result) => {
+    t.ok(err instanceof RequestAbortedError)
+    t.strictEqual(order.length, 0)
+  })
+
+  request.abort()
+})
+
+test('ResponseError error (no retry)', t => {
+  t.plan(10)
+
+  const MockConnection = buildMockConnection({
+    onRequest (params) {
+      return {
+        statusCode: 400,
+        body: { hello: 'world' }
+      }
+    }
+  })
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnection,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.DESERIALIZATION,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.DESERIALIZATION)
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof ResponseError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.ok(err instanceof ResponseError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('ResponseError error (with retry)', t => {
+  t.plan(14)
+
+  const MockConnection = buildMockConnection({
+    onRequest (params) {
+      return {
+        statusCode: 504,
+        body: { hello: 'world' }
+      }
+    }
+  })
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnection,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.DESERIALIZATION,
+    events.REQUEST,
+    events.DESERIALIZATION,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.DESERIALIZATION)
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof ResponseError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.ok(err instanceof ResponseError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('Serialization Error', t => {
+  t.plan(6)
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnection,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.ok(err instanceof SerializationError)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (_err, request) => {
+    t.fail('Should not be called')
+  })
+
+  client.on(events.RESPONSE, (_err, request) => {
+    t.fail('Should not be called')
+  })
+
+  const body = {}
+  body.o = body
+  client.index({ index: 'test', body }, (err, result) => {
+    t.ok(err instanceof SerializationError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('Deserialization Error', t => {
+  t.plan(10)
+
+  class MockConnection extends Connection {
+    request (params, callback) {
+      const body = '{"hello":"wor'
+      const stream = intoStream(body)
+      stream.statusCode = 200
+      stream.headers = {
+        'content-type': 'application/json;utf=8',
+        'content-length': body.length,
+        connection: 'keep-alive',
+        date: new Date().toISOString()
+      }
+      stream.on('close', () => t.pass('Stream destroyed'))
+      process.nextTick(callback, null, stream)
+      return { abort () {} }
+    }
+  }
+
+  const client = new Client({
+    node: 'http://localhost:9200',
+    Connection: MockConnection,
+    maxRetries: 1
+  })
+
+  const order = [
+    events.SERIALIZATION,
+    events.REQUEST,
+    events.DESERIALIZATION,
+    events.RESPONSE
+  ]
+
+  client.on(events.SERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.SERIALIZATION)
+  })
+
+  client.on(events.REQUEST, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.REQUEST)
+  })
+
+  client.on(events.DESERIALIZATION, (err, request) => {
+    t.error(err)
+    t.strictEqual(order.shift(), events.DESERIALIZATION)
+  })
+
+  client.on(events.RESPONSE, (err, request) => {
+    t.ok(err instanceof DeserializationError)
+    t.strictEqual(order.shift(), events.RESPONSE)
+  })
+
+  client.info((err, result) => {
+    t.ok(err instanceof DeserializationError)
+    t.strictEqual(order.length, 0)
+  })
+})
+
+test('Socket destroyed while reading the body', t => {
+  t.plan(14)
+
+  function handler (req, res) {
+    const body = JSON.stringify({ hello: 'world' })
+    res.setHeader('Content-Type', 'application/json;utf=8')
+    res.setHeader('Content-Length', body.length + '')
+    res.write(body.slice(0, -5))
+    setTimeout(() => {
+      res.socket.destroy()
+    }, 500)
+  }
+
+  buildServer(handler, ({ port }, server) => {
+    const client = new Client({ node: `http://localhost:${port}`, maxRetries: 1 })
+
+    const order = [
+      events.SERIALIZATION,
+      events.REQUEST,
+      events.DESERIALIZATION,
+      events.REQUEST,
+      events.DESERIALIZATION,
+      events.RESPONSE
+    ]
+
+    client.on(events.SERIALIZATION, (err, request) => {
+      t.error(err)
+      t.strictEqual(order.shift(), events.SERIALIZATION)
+    })
+
+    client.on(events.REQUEST, (err, request) => {
+      t.error(err)
+      t.strictEqual(order.shift(), events.REQUEST)
+    })
+
+    client.on(events.DESERIALIZATION, (err, request) => {
+      t.error(err)
+      t.strictEqual(order.shift(), events.DESERIALIZATION)
+    })
+
+    client.on(events.RESPONSE, (err, request) => {
+      t.ok(err instanceof ConnectionError)
+      t.strictEqual(order.shift(), events.RESPONSE)
+    })
+
+    client.info((err, result) => {
+      t.ok(err instanceof ConnectionError)
+      t.strictEqual(order.length, 0)
+      server.stop()
+    })
+  })
+})

test/acceptance/proxy.test.js

@@ -0,0 +1,149 @@
+'use strict'
+
+// We are using self-signed certificates
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0
+
+const { test } = require('tap')
+const { Client } = require('../../index')
+const {
+  buildProxy: {
+    createProxy,
+    createSecureProxy,
+    createServer,
+    createSecureServer
+  }
+} = require('../utils')
+
+test('http-http proxy support', async t => {
+  const server = await createServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  const client = new Client({
+    node: `http://${server.address().address}:${server.address().port}`,
+    proxy: `http://${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})
+
+test('http-https proxy support', async t => {
+  const server = await createSecureServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  const client = new Client({
+    node: `https://${server.address().address}:${server.address().port}`,
+    proxy: `http://${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})
+
+test('https-http proxy support', async t => {
+  const server = await createServer()
+  const proxy = await createSecureProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  const client = new Client({
+    node: `http://${server.address().address}:${server.address().port}`,
+    proxy: `https://${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})
+
+test('https-https proxy support', async t => {
+  const server = await createSecureServer()
+  const proxy = await createSecureProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  const client = new Client({
+    node: `https://${server.address().address}:${server.address().port}`,
+    proxy: `https://${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})
+
+test('http basic authentication', async t => {
+  const server = await createServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  proxy.authenticate = function (req, fn) {
+    fn(null, req.headers['proxy-authorization'] === `Basic ${Buffer.from('hello:world').toString('base64')}`)
+  }
+
+  const client = new Client({
+    node: `http://${server.address().address}:${server.address().port}`,
+    proxy: `http://hello:world@${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})
+
+test('https basic authentication', async t => {
+  const server = await createSecureServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => {
+    t.strictEqual(req.url, '/_cluster/health')
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ hello: 'world' }))
+  })
+
+  proxy.authenticate = function (req, fn) {
+    fn(null, req.headers['proxy-authorization'] === `Basic ${Buffer.from('hello:world').toString('base64')}`)
+  }
+
+  const client = new Client({
+    node: `https://${server.address().address}:${server.address().port}`,
+    proxy: `http://hello:world@${proxy.address().address}:${proxy.address().port}`
+  })
+
+  const response = await client.cluster.health()
+  t.deepEqual(response.body, { hello: 'world' })
+
+  server.close()
+  proxy.close()
+})

test/acceptance/resurrect.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/acceptance/sniff.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -69,7 +84,8 @@ test('Should update the connection pool', t => {
               ml: false
             },
             ssl: null,
-            agent: null
+            agent: null,
+            proxy: null
           })
         }
       }

test/integration/helper.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -34,4 +49,45 @@ function to (promise) {
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
-module.exports = { runInParallel, delve, to, sleep }
+function isXPackTemplate (name) {
+  if (name.startsWith('.monitoring-')) {
+    return true
+  }
+  if (name.startsWith('.watch') || name.startsWith('.triggered_watches')) {
+    return true
+  }
+  if (name.startsWith('.data-frame-')) {
+    return true
+  }
+  if (name.startsWith('.ml-')) {
+    return true
+  }
+  if (name.startsWith('.transform-')) {
+    return true
+  }
+  switch (name) {
+    case '.watches':
+    case 'logstash-index-template':
+    case '.logstash-management':
+    case 'security_audit_log':
+    case '.slm-history':
+    case '.async-search':
+    case 'saml-service-provider':
+    case 'ilm-history':
+    case 'logs':
+    case 'logs-settings':
+    case 'logs-mappings':
+    case 'metrics':
+    case 'metrics-settings':
+    case 'metrics-mappings':
+    case 'synthetics':
+    case 'synthetics-settings':
+    case 'synthetics-mappings':
+    case '.snapshot-blob-cache':
+    case '.deprecation-indexing-template':
+      return true
+  }
+  return false
+}
+
+module.exports = { runInParallel, delve, to, sleep, isXPackTemplate }

test/integration/helpers/bulk.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/integration/helpers/msearch.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/integration/helpers/scroll.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/integration/helpers/search.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/integration/index.js

@@ -1,9 +1,29 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
+process.on('unhandledRejection', function (err) {
+  console.error(err)
+  process.exit(1)
+})
+
 const { writeFileSync, readFileSync, accessSync, mkdirSync, readdirSync, statSync } = require('fs')
 const { join, sep } = require('path')
 const yaml = require('js-yaml')
@@ -23,9 +43,10 @@ const MAX_API_TIME = 1000 * 90
 const MAX_FILE_TIME = 1000 * 30
 const MAX_TEST_TIME = 1000 * 3
 
-const ossSkips = {
+const freeSkips = {
   'cat.indices/10_basic.yml': ['Test cat indices output for closed index (pre 7.2.0)'],
   'cluster.health/10_basic.yml': ['cluster health with closed index (pre 7.2.0)'],
+
   // TODO: remove this once 'arbitrary_key' is implemented
   // https://github.com/elastic/elasticsearch/pull/41492
   'indices.split/30_copy_settings.yml': ['*'],
@@ -36,12 +57,18 @@ const ossSkips = {
   // which triggers a retry and the node to be marked as dead
   'search.aggregation/240_max_buckets.yml': ['*']
 }
-const xPackBlackList = {
-  // file path: test name
+const platinumBlackList = {
+  // this two test cases are broken, we should
+  // return on those in the future.
+  'analytics/top_metrics.yml': [
+    'sort by keyword field fails',
+    'sort by string script fails'
+  ],
   'cat.aliases/10_basic.yml': ['Empty cluster'],
   'index/10_with_id.yml': ['Index with ID'],
   'indices.get_alias/10_basic.yml': ['Get alias against closed indices'],
   'indices.get_alias/20_empty.yml': ['Check empty aliases when getting all aliases via /_alias'],
+  'text_structure/find_structure.yml': ['*'],
   // https://github.com/elastic/elasticsearch/pull/39400
   'ml/jobs_crud.yml': ['Test put job with id that is already taken'],
   // object keys must me strings, and `0.0.toString()` is `0`
@@ -62,6 +89,7 @@ const xPackBlackList = {
   'monitoring/bulk/20_privileges.yml': ['*'],
   'license/20_put_license.yml': ['*'],
   'snapshot/10_basic.yml': ['*'],
+  'snapshot/20_operator_privileges_disabled.yml': ['*'],
   // the body is correct, but the regex is failing
   'sql/sql.yml': ['Getting textual representation'],
   // we are setting two certificates in the docker config
@@ -83,6 +111,12 @@ const xPackBlackList = {
   'transforms_stats.yml': ['*'],
   'transforms_stats_continuous.yml': ['*'],
   'transforms_update.yml': ['*'],
+  // js does not support ulongs
+  'unsigned_long/10_basic.yml': ['*'],
+  'unsigned_long/20_null_value.yml': ['*'],
+  'unsigned_long/30_multi_fields.yml': ['*'],
+  'unsigned_long/40_different_numeric.yml': ['*'],
+  'unsigned_long/50_script_values.yml': ['*'],
   // docker issue?
   'watcher/execute_watch/60_http_input.yml': ['*'],
   // the checks are correct, but for some reason the test is failing on js side
@@ -129,9 +163,9 @@ async function start ({ client, isXPack }) {
   log(`Checking out sha ${sha}...`)
   await withSHA(sha)
 
-  log(`Testing ${isXPack ? 'XPack' : 'oss'} api...`)
+  log(`Testing ${isXPack ? 'Platinum' : 'Free'} api...`)
   const junit = createJunitReporter()
-  const junitTestSuites = junit.testsuites(`Integration test for ${isXPack ? 'XPack' : 'oss'} api`)
+  const junitTestSuites = junit.testsuites(`Integration test for ${isXPack ? 'Platinum' : 'Free'} api`)
 
   const stats = {
     total: 0,
@@ -182,8 +216,11 @@ async function start ({ client, isXPack }) {
       const tests = data
         .split('\n---\n')
         .map(s => s.trim())
+        // empty strings
         .filter(Boolean)
         .map(parse)
+        // null values
+        .filter(Boolean)
 
       // get setup and teardown if present
       var setupTest = null
@@ -219,7 +256,7 @@ async function start ({ client, isXPack }) {
           junitTestCase.end()
           junitTestSuite.end()
           junitTestSuites.end()
-          generateJunitXmlReport(junit, isXPack ? 'xpack' : 'oss')
+          generateJunitXmlReport(junit, isXPack ? 'platinum' : 'free')
           console.error(err)
           process.exit(1)
         }
@@ -247,7 +284,7 @@ async function start ({ client, isXPack }) {
     }
   }
   junitTestSuites.end()
-  generateJunitXmlReport(junit, isXPack ? 'xpack' : 'oss')
+  generateJunitXmlReport(junit, isXPack ? 'platinum' : 'free')
   log(`Total testing time: ${ms(now() - totalTime)}`)
   log(`Test stats:
   - Total: ${stats.total}
@@ -267,8 +304,9 @@ function now () {
 }
 
 function parse (data) {
+  const schema = yaml.Schema.create(yaml.CORE_SCHEMA, [])
   try {
-    var doc = yaml.safeLoad(data)
+    var doc = yaml.safeLoad(data, { schema })
   } catch (err) {
     console.error(err)
     return
@@ -389,26 +427,26 @@ if (require.main === module) {
 }
 
 const shouldSkip = (isXPack, file, name) => {
-  var list = Object.keys(ossSkips)
+  var list = Object.keys(freeSkips)
   for (var i = 0; i < list.length; i++) {
-    const ossTest = ossSkips[list[i]]
-    for (var j = 0; j < ossTest.length; j++) {
-      if (file.endsWith(list[i]) && (name === ossTest[j] || ossTest[j] === '*')) {
+    const freeTest = freeSkips[list[i]]
+    for (var j = 0; j < freeTest.length; j++) {
+      if (file.endsWith(list[i]) && (name === freeTest[j] || freeTest[j] === '*')) {
         const testName = file.slice(file.indexOf(`${sep}elasticsearch${sep}`)) + ' / ' + name
-        log(`Skipping test ${testName} because is blacklisted in the oss test`)
+        log(`Skipping test ${testName} because is blacklisted in the free test`)
         return true
       }
     }
   }
 
   if (file.includes('x-pack') || isXPack) {
-    list = Object.keys(xPackBlackList)
+    list = Object.keys(platinumBlackList)
     for (i = 0; i < list.length; i++) {
-      const platTest = xPackBlackList[list[i]]
+      const platTest = platinumBlackList[list[i]]
       for (j = 0; j < platTest.length; j++) {
         if (file.endsWith(list[i]) && (name === platTest[j] || platTest[j] === '*')) {
           const testName = file.slice(file.indexOf(`${sep}elasticsearch${sep}`)) + ' / ' + name
-          log(`Skipping test ${testName} because is blacklisted in the XPack test`)
+          log(`Skipping test ${testName} because is blacklisted in the platinum test`)
           return true
         }
       }

test/integration/test-runner.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 
@@ -12,7 +27,7 @@ const helper = require('./helper')
 const deepEqual = require('fast-deep-equal')
 const { ConfigurationError } = require('../../lib/errors')
 
-const { delve, to } = helper
+const { delve, to, isXPackTemplate, sleep } = helper
 
 const supportedFeatures = [
   'gtelte',
@@ -37,135 +52,115 @@ function build (opts = {}) {
    * Runs a cleanup, removes all indices, aliases, templates, and snapshots
    * @returns {Promise}
    */
-  async function cleanup () {
+  async function cleanup (isXPack) {
     response = null
     stash.clear()
 
-    try {
-      await client.indices.deleteAlias({
-        index: '_all',
-        name: '_all'
-      }, { ignore: [404] })
-    } catch (err) {
-      assert.ifError(err, 'should not error: indices.deleteAlias')
-    }
-
-    try {
-      await client.indices.delete({
-        index: '_all',
-        expand_wildcards: 'open,closed,hidden'
-      }, { ignore: [404] })
-    } catch (err) {
-      assert.ifError(err, 'should not error: indices.delete')
-    }
-
-    try {
-      await client.indices.deleteTemplate({ name: '*' })
-    } catch (err) {
-      assert.ifError(err, 'should not error: indices.deleteTemplate')
-    }
-
-    try {
-      const { body: repositories } = await client.snapshot.getRepository()
-      for (const repository of Object.keys(repositories)) {
-        await client.snapshot.delete({ repository, snapshot: '*' }, { ignore: [404] })
-        await client.snapshot.deleteRepository({ repository }, { ignore: [404] })
-      }
-    } catch (err) {
-      assert.ifError(err, 'should not error: snapshot.delete / snapshot.deleteRepository')
-    }
-  }
-
-  /**
-   * Runs some additional API calls to prepare ES for the xpack test,
-   * This set of calls should be executed before the final clenup.
-   * @returns {Promise}
-   */
-  async function cleanupXPack () {
-    // tap.comment('XPack Cleanup')
-
-    try {
-      const { body } = await client.security.getRole()
-      const roles = Object.keys(body).filter(n => !body[n].metadata._reserved)
-      await helper.runInParallel(
-        client, 'security.deleteRole',
-        roles.map(r => ({ name: r }))
-      )
-    } catch (err) {
-      assert.ifError(err, 'should not error: security role cleanup')
-    }
-
-    try {
-      const { body } = await client.security.getUser()
-      const users = Object.keys(body).filter(n => !body[n].metadata._reserved)
-      await helper.runInParallel(
-        client, 'security.deleteUser',
-        users.map(r => ({ username: r }))
-      )
-    } catch (err) {
-      assert.ifError(err, 'should not error: security user cleanup')
-    }
-
-    try {
-      const { body } = await client.security.getPrivileges()
-      const privileges = []
-      Object.keys(body).forEach(app => {
-        Object.keys(body[app]).forEach(priv => {
-          privileges.push({
-            name: body[app][priv].name,
-            application: body[app][priv].application
-          })
-        })
-      })
-      await helper.runInParallel(client, 'security.deletePrivileges', privileges)
-    } catch (err) {
-      assert.ifError(err, 'should not error: security privileges cleanup')
-    }
-
-    try {
-      await client.ml.stopDatafeed({ datafeedId: '*', force: true })
-      const { body } = await client.ml.getDatafeeds({ datafeedId: '*' })
-      const feeds = body.datafeeds.map(f => f.datafeed_id)
-      await helper.runInParallel(
-        client, 'ml.deleteDatafeed',
-        feeds.map(f => ({ datafeedId: f }))
-      )
-    } catch (err) {
-      assert.ifError(err, 'should error: not ml datafeed cleanup')
-    }
-
-    try {
-      await client.ml.closeJob({ jobId: '*', force: true })
-      const { body } = await client.ml.getJobs({ jobId: '*' })
-      const jobs = body.jobs.map(j => j.job_id)
-      await helper.runInParallel(
-        client, 'ml.deleteJob',
-        jobs.map(j => ({ jobId: j, waitForCompletion: true, force: true }))
-      )
-    } catch (err) {
-      assert.ifError(err, 'should not error: ml job cleanup')
-    }
-
-    try {
-      const { body } = await client.rollup.getJobs({ id: '_all' })
-      const jobs = body.jobs.map(j => j.config.id)
+    if (isXPack) {
+      // wipe rollup jobs
+      const { body: jobsList } = await client.rollup.getJobs({ id: '_all' })
+      const jobsIds = jobsList.jobs.map(j => j.config.id)
       await helper.runInParallel(
         client, 'rollup.stopJob',
-        jobs.map(j => ({ id: j, waitForCompletion: true }))
+        jobsIds.map(j => ({ id: j, waitForCompletion: true }))
       )
       await helper.runInParallel(
         client, 'rollup.deleteJob',
-        jobs.map(j => ({ id: j }))
+        jobsIds.map(j => ({ id: j }))
       )
-    } catch (err) {
-      assert.ifError(err, 'should not error: rollup jobs cleanup')
+
+      // delete slm policies
+      const { body: policies } = await client.slm.getLifecycle()
+      await helper.runInParallel(
+        client, 'slm.deleteLifecycle',
+        Object.keys(policies).map(p => ({ policy_id: p }))
+      )
+
+      // remove 'x_pack_rest_user', used in some xpack test
+      await client.security.deleteUser({ username: 'x_pack_rest_user' }, { ignore: [404] })
     }
 
-    try {
-      const { body } = await client.tasks.list()
-      const tasks = Object.keys(body.nodes)
+    // clean snapshots
+    const { body: repositories } = await client.snapshot.getRepository()
+    for (const repository of Object.keys(repositories)) {
+      await client.snapshot.delete({ repository, snapshot: '*' }, { ignore: [404] })
+      await client.snapshot.deleteRepository({ repository }, { ignore: [404] })
+    }
+
+    if (isXPack) {
+      // clean data streams
+      await client.indices.deleteDataStream({ name: '*' })
+    }
+
+    // clean all indices
+    await client.indices.delete({ index: '*,-.ds-ilm-history-*', expand_wildcards: 'open,closed,hidden' }, { ignore: [404] })
+
+    if (isXPack) {
+      // delete templates
+      const { body: templates } = await client.cat.templates({ h: 'name' })
+      for (const template of templates.split('\n').filter(Boolean)) {
+        if (isXPackTemplate(template)) continue
+        const { body } = await client.indices.deleteTemplate({ name: template }, { ignore: [404] })
+        if (JSON.stringify(body).includes(`index_template [${template}] missing`)) {
+          await client.indices.deleteIndexTemplate({ name: template }, { ignore: [404] })
+        }
+      }
+
+      // delete component template
+      const { body } = await client.cluster.getComponentTemplate()
+      const components = body.component_templates.filter(c => !isXPackTemplate(c.name)).map(c => c.name)
+      if (components.length > 0) {
+        await client.cluster.deleteComponentTemplate({ name: components.join(',') }, { ignore: [404] })
+      }
+    } else {
+      // clean all templates
+      await client.indices.deleteTemplate({ name: '*' })
+
+      // clean all templates
+      await client.indices.deleteIndexTemplate({ name: '*' })
+
+      // clean all templates
+      await client.cluster.deleteComponentTemplate({ name: '*' })
+    }
+
+    // Remove any cluster setting
+    const { body: settings } = await client.cluster.getSettings()
+    const newSettings = {}
+    for (const setting in settings) {
+      if (Object.keys(settings[setting]).length === 0) continue
+      newSettings[setting] = {}
+      for (const key in settings[setting]) {
+        newSettings[setting][`${key}.*`] = null
+      }
+    }
+    if (Object.keys(newSettings).length > 0) {
+      await client.cluster.putSettings({ body: newSettings })
+    }
+
+    if (isXPack) {
+      // delete ilm policies
+      const preserveIlmPolicies = [
+        'ilm-history-ilm-policy', 'slm-history-ilm-policy',
+        'watch-history-ilm-policy', 'ml-size-based-ilm-policy',
+        'logs', 'metrics'
+      ]
+      const { body: policies } = await client.ilm.getLifecycle()
+      for (const policy in policies) {
+        if (preserveIlmPolicies.includes(policy)) continue
+        await client.ilm.deleteLifecycle({ policy })
+      }
+
+      // delete autofollow patterns
+      const { body: patterns } = await client.ccr.getAutoFollowPattern()
+      for (const { name } of patterns.patterns) {
+        await client.ccr.deleteAutoFollowPattern({ name })
+      }
+
+      // delete all tasks
+      const { body: nodesTask } = await client.tasks.list()
+      const tasks = Object.keys(nodesTask.nodes)
         .reduce((acc, node) => {
-          const { tasks } = body.nodes[node]
+          const { tasks } = nodesTask.nodes[node]
           Object.keys(tasks).forEach(id => {
             if (tasks[id].cancellable) acc.push(id)
           })
@@ -176,21 +171,14 @@ function build (opts = {}) {
         client, 'tasks.cancel',
         tasks.map(id => ({ taskId: id }))
       )
-    } catch (err) {
-      assert.ifError(err, 'should not error: tasks cleanup')
     }
 
-    try {
-      await client.ilm.removePolicy({ index: '_all' })
-    } catch (err) {
-      assert.ifError(err, 'should not error: ilm.removePolicy')
-    }
-
-    // refresh the all indexes
-    try {
-      await client.indices.refresh({ index: '_all' })
-    } catch (err) {
-      assert.ifError(err, 'should not error: indices.refresh')
+    // wait for pending task before resolving the promise
+    await sleep(100)
+    while (true) {
+      const { body } = await client.cluster.pendingTasks()
+      if (body.tasks.length === 0) break
+      await sleep(500)
     }
   }
 
@@ -238,9 +226,7 @@ function build (opts = {}) {
 
     if (teardown) await exec('Teardown', teardown, stats, junit)
 
-    if (isXPack) await cleanupXPack()
-
-    await cleanup()
+    await cleanup(isXPack)
   }
 
   /**
@@ -264,20 +250,26 @@ function build (opts = {}) {
       // eg: 'Basic ${auth}' we search the stahed value 'auth'
       // and the resulting value will be 'Basic valueOfAuth'
       if (typeof val === 'string' && val.includes('${')) {
-        const start = val.indexOf('${')
-        const end = val.indexOf('}', val.indexOf('${'))
-        const stashedKey = val.slice(start + 2, end)
-        const stashed = stash.get(stashedKey)
-        obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
+        while (obj[key].includes('${')) {
+          const val = obj[key]
+          const start = val.indexOf('${')
+          const end = val.indexOf('}', val.indexOf('${'))
+          const stashedKey = val.slice(start + 2, end)
+          const stashed = stash.get(stashedKey)
+          obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
+        }
         continue
       }
       // handle json strings, eg: '{"hello":"$world"}'
       if (typeof val === 'string' && val.includes('"$')) {
-        const start = val.indexOf('"$')
-        const end = val.indexOf('"', start + 1)
-        const stashedKey = val.slice(start + 2, end)
-        const stashed = '"' + stash.get(stashedKey) + '"'
-        obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
+        while (obj[key].includes('"$')) {
+          const val = obj[key]
+          const start = val.indexOf('"$')
+          const end = val.indexOf('"', start + 1)
+          const stashedKey = val.slice(start + 2, end)
+          const stashed = '"' + stash.get(stashedKey) + '"'
+          obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
+        }
         continue
       }
       // if the key value is a string, and the string includes '$'

test/types/api-response-body.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType, expectError } from 'tsd'
 import { Readable as ReadableStream } from 'stream';

test/types/api-response.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType } from 'tsd'
 import { TransportRequestCallback, Context } from '../../lib/Transport'

test/types/client-options.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { URL } from 'url'
 import { expectType, expectError } from 'tsd'
@@ -677,3 +692,28 @@ expectError<errors.ConfigurationError>(
     context: 'hello world'
   })
 )
+
+/**
+ * `proxy` option
+ */
+expectType<Client>(
+  new Client({
+    node: 'http://localhost:9200',
+    proxy: 'http://localhost:8080'
+  })
+)
+
+expectType<Client>(
+  new Client({
+    node: 'http://localhost:9200',
+    proxy: new URL('http://localhost:8080')
+  })
+)
+
+expectError<errors.ConfigurationError>(
+  // @ts-expect-error
+  new Client({
+    node: 'http://localhost:9200',
+    proxy: 42
+  })
+)

test/types/client.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType } from 'tsd'
 import { Client, ApiError, ApiResponse, RequestEvent, ResurrectEvent } from '../../'

test/types/connection-pool.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType, expectAssignable } from 'tsd'
 import { URL } from 'url'

test/types/connection.test-d.ts

@@ -1,26 +1,54 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType } from 'tsd'
 import { URL } from 'url'
 import { Connection } from '../../'
+import { ConnectionOptions } from '../../lib/Connection'
 
-const conn = new Connection({
-  url: new URL('http://localhost:9200'),
-  ssl: { ca: 'string' },
-  id: 'id',
-  headers: {},
-  agent: { keepAlive: false },
-  status: 'alive',
-  roles: { master: true },
-  auth: { username: 'username', password: 'password' }
-})
+{
+  const conn = new Connection({
+    url: new URL('http://localhost:9200'),
+    ssl: { ca: 'string' },
+    id: 'id',
+    headers: {},
+    agent: { keepAlive: false },
+    status: 'alive',
+    roles: { master: true },
+    auth: { username: 'username', password: 'password' }
+  })
 
-expectType<Connection>(conn)
-expectType<URL>(conn.url)
-expectType<string>(conn.id)
-expectType<Record<string, any>>(conn.headers)
-expectType<number>(conn.deadCount)
-expectType<number>(conn.resurrectTimeout)
-expectType<string>(conn.status)
+  expectType<Connection>(conn)
+  expectType<URL>(conn.url)
+  expectType<string>(conn.id)
+  expectType<Record<string, any>>(conn.headers)
+  expectType<number>(conn.deadCount)
+  expectType<number>(conn.resurrectTimeout)
+  expectType<string>(conn.status)
+}
+
+{
+  const conn = new Connection({
+    url: new URL('http://localhost:9200'),
+    agent (opts) {
+      expectType<ConnectionOptions>(opts)
+      return 'the agent'
+    }
+  })
+}

test/types/errors.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType } from 'tsd'
 import { errors, ApiResponse, Connection } from '../../'

test/types/helpers.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType, expectError, expectAssignable } from 'tsd'
 import { Client } from '../../'

test/types/kibana.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType, expectNotType, expectError } from 'tsd'
 import { Client, RequestEvent, ResurrectEvent, ApiError, ApiResponse } from '../../'

test/types/serializer.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { expectType } from 'tsd'
 import { Serializer } from '../../'

test/types/transport.test-d.ts

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+  /*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import { Readable as ReadableStream } from 'stream';
 import { expectType, expectAssignable, expectError } from 'tsd'

test/unit/api-async.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/unit/api.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'
 

test/unit/base-connection-pool.test.js

@@ -1,6 +1,21 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 'use strict'