@elastic/elasticsearch 7.10.0 → 7.13.0

package/index.js

@@ -19,20 +19,24 @@
 
 'use strict'
 
-const nodeMajor = Number(process.versions.node.split('.')[0])
-
 const { EventEmitter } = require('events')
 const { URL } = require('url')
 const debug = require('debug')('elasticsearch')
 const Transport = require('./lib/Transport')
 const Connection = require('./lib/Connection')
 const { ConnectionPool, CloudConnectionPool } = require('./lib/pool')
-// Helpers works only in Node.js >= 10
-const Helpers = nodeMajor < 10 ? /* istanbul ignore next */ null : require('./lib/Helpers')
+const Helpers = require('./lib/Helpers')
 const Serializer = require('./lib/Serializer')
 const errors = require('./lib/errors')
 const { ConfigurationError } = errors
 const { prepareHeaders } = Connection.internals
+let clientVersion = require('./package.json').version
+/* istanbul ignore next */
+if (clientVersion.includes('-')) {
+  // clean prerelease
+  clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
+}
+const nodeVersion = process.versions.node
 
 const kInitialOptions = Symbol('elasticsearchjs-initial-options')
 const kChild = Symbol('elasticsearchjs-child')
@@ -41,24 +45,6 @@ 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 })
@@ -125,20 +111,28 @@ class Client extends ESAPI {
         auth: null,
         opaqueIdPrefix: null,
         context: null,
-        proxy: null
+        proxy: null,
+        enableMetaHeader: true,
+        disablePrototypePoisoningProtection: false
       }, 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
       this[kEventEmitter] = options[kChild].eventEmitter
     } else {
       this[kEventEmitter] = new EventEmitter()
-      this.serializer = new options.Serializer()
+      this.serializer = new options.Serializer({
+        disablePrototypePoisoningProtection: options.disablePrototypePoisoningProtection
+      })
       this.connectionPool = new options.ConnectionPool({
         pingTimeout: options.pingTimeout,
         resurrectStrategy: options.resurrectStrategy,
@@ -177,10 +171,13 @@ class Client extends ESAPI {
       context: options.context
     })
 
-    /* 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
+    })
   }
 
   get emit () {
@@ -205,7 +202,7 @@ class Client extends ESAPI {
       opts = {}
     }
 
-    var [namespace, method] = name.split('.')
+    let [namespace, method] = name.split('.')
     if (method == null) {
       method = namespace
       namespace = null
@@ -314,7 +311,9 @@ const events = {
   RESPONSE: 'response',
   REQUEST: 'request',
   SNIFF: 'sniff',
-  RESURRECT: 'resurrect'
+  RESURRECT: 'resurrect',
+  SERIALIZATION: 'serialization',
+  DESERIALIZATION: 'deserialization'
 }
 
 module.exports = {

package/lib/Connection.js

@@ -25,7 +25,7 @@ const hpagent = require('hpagent')
 const http = require('http')
 const https = require('https')
 const debug = require('debug')('elasticsearch')
-const pump = require('pump')
+const { pipeline } = require('stream')
 const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/
 const {
   ConnectionError,
@@ -82,6 +82,7 @@ class Connection {
 
   request (params, callback) {
     this._openRequests++
+    let cleanedListeners = false
 
     const requestParams = this.buildRequestObject(params)
     // https://github.com/nodejs/node/commit/b961d9fd83
@@ -132,9 +133,9 @@ class Connection {
 
     // starts the request
     if (isStream(params.body) === true) {
-      pump(params.body, request, err => {
+      pipeline(params.body, request, err => {
         /* istanbul ignore if  */
-        if (err != null) {
+        if (err != null && cleanedListeners === false) {
           cleanListeners()
           this._openRequests--
           callback(err, null)
@@ -151,6 +152,7 @@ class Connection {
       request.removeListener('timeout', onTimeout)
       request.removeListener('error', onError)
       request.removeListener('abort', onAbort)
+      cleanedListeners = true
     }
   }
 
@@ -211,8 +213,8 @@ class Connection {
     }
 
     const paramsKeys = Object.keys(params)
-    for (var i = 0, len = paramsKeys.length; i < len; i++) {
-      var key = paramsKeys[i]
+    for (let i = 0, len = paramsKeys.length; i < len; i++) {
+      const key = paramsKeys[i]
       if (key === 'path') {
         request.pathname = resolve(request.pathname, params[key])
       } else if (key === 'querystring' && !!params[key] === true) {

package/lib/Helpers.d.ts

@@ -25,8 +25,8 @@ export default class Helpers {
   search<TDocument = unknown, TRequestBody extends RequestBody = Record<string, any>>(params: Search<TRequestBody>, options?: TransportRequestOptions): Promise<TDocument[]>
   scrollSearch<TDocument = unknown, TResponse = Record<string, any>, TRequestBody extends  RequestBody = Record<string, any>, TContext = Context>(params: Search<TRequestBody>, options?: TransportRequestOptions): AsyncIterable<ScrollSearchResponse<TDocument, TResponse, TContext>>
   scrollDocuments<TDocument = unknown, TRequestBody extends RequestBody = Record<string, any>>(params: Search<TRequestBody>, options?: TransportRequestOptions): AsyncIterable<TDocument>
-  msearch(options?: MsearchHelperOptions): MsearchHelper
-  bulk<TDocument = unknown>(options: BulkHelperOptions<TDocument>): BulkHelper<BulkStats>
+  msearch(options?: MsearchHelperOptions, reqOptions?: TransportRequestOptions): MsearchHelper
+  bulk<TDocument = unknown>(options: BulkHelperOptions<TDocument>, reqOptions?: TransportRequestOptions): BulkHelper<BulkStats>
 }
 
 export interface ScrollSearchResponse<TDocument = unknown, TResponse = Record<string, any>, TContext = Context> extends ApiResponse<TResponse, TContext> {

package/lib/Helpers.js

@@ -28,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
   }
 
@@ -71,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
@@ -99,7 +105,7 @@ class Helpers {
       stop = true
       await this[kClient].clearScroll(
         { body: { scroll_id } },
-        { ignore: [400] }
+        { ignore: [400], ...options }
       )
     }
 
@@ -152,7 +158,7 @@ class Helpers {
    */
   async * scrollDocuments (params, options) {
     appendFilterPath('hits.hits._source', params, true)
-    for await (const { documents } of this.scrollSearch(params)) {
+    for await (const { documents } of this.scrollSearch(params, options)) {
       for (const document of documents) {
         yield document
       }
@@ -163,9 +169,10 @@ class Helpers {
    * Creates a msearch helper instance. Once you configure it, you can use the provided
    * `search` method to add new searches in the queue.
    * @param {object} options - The configuration of the msearch operations.
+   * @param {object} reqOptions - The client optional configuration for this request.
    * @return {object} The possible operations to run.
    */
-  msearch (options = {}) {
+  msearch (options = {}, reqOptions = {}) {
     const client = this[kClient]
     const {
       operations = 5,
@@ -372,7 +379,7 @@ class Helpers {
       // This function never returns an error, if the msearch operation fails,
       // the error is dispatched to all search executors.
       function tryMsearch (msearchBody, callbacks, done) {
-        client.msearch(Object.assign({}, msearchOptions, { body: msearchBody }), (err, results) => {
+        client.msearch(Object.assign({}, msearchOptions, { body: msearchBody }), reqOptions, (err, results) => {
           const retryBody = []
           const retryCallbacks = []
           if (err) {
@@ -409,11 +416,16 @@ class Helpers {
    * Creates a bulk helper instance. Once you configure it, you can pick which operation
    * to execute with the given dataset, index, create, update, and delete.
    * @param {object} options - The configuration of the bulk operation.
+   * @param {object} reqOptions - The client optional configuration for this request.
    * @return {object} The possible operations to run with the datasource.
    */
-  bulk (options) {
+  bulk (options, reqOptions = {}) {
     const client = this[kClient]
-    const { serialize, deserialize } = client.serializer
+    const { serializer } = client
+    if (this[kMetaHeader] !== null) {
+      reqOptions.headers = reqOptions.headers || {}
+      reqOptions.headers['x-elastic-client-meta'] = this[kMetaHeader] + ',h=bp'
+    }
     const {
       datasource,
       onDocument,
@@ -493,19 +505,19 @@ class Helpers {
           ? Object.keys(action[0])[0]
           : Object.keys(action)[0]
         if (operation === 'index' || operation === 'create') {
-          actionBody = serialize(action)
-          payloadBody = typeof chunk === 'string' ? chunk : serialize(chunk)
+          actionBody = serializer.serialize(action)
+          payloadBody = typeof chunk === 'string' ? chunk : serializer.serialize(chunk)
           chunkBytes += Buffer.byteLength(actionBody) + Buffer.byteLength(payloadBody)
           bulkBody.push(actionBody, payloadBody)
         } else if (operation === 'update') {
-          actionBody = serialize(action[0])
+          actionBody = serializer.serialize(action[0])
           payloadBody = typeof chunk === 'string'
             ? `{"doc":${chunk}}`
-            : serialize({ doc: chunk, ...action[1] })
+            : serializer.serialize({ doc: chunk, ...action[1] })
           chunkBytes += Buffer.byteLength(actionBody) + Buffer.byteLength(payloadBody)
           bulkBody.push(actionBody, payloadBody)
         } else if (operation === 'delete') {
-          actionBody = serialize(action)
+          actionBody = serializer.serialize(action)
           chunkBytes += Buffer.byteLength(actionBody)
           bulkBody.push(actionBody)
         } else {
@@ -538,7 +550,7 @@ class Helpers {
           index: typeof refreshOnCompletion === 'string'
             ? refreshOnCompletion
             : '_all'
-        })
+        }, reqOptions)
       }
 
       stats.time = Date.now() - startTime
@@ -657,13 +669,13 @@ class Helpers {
             return
           }
           for (let i = 0, len = bulkBody.length; i < len; i = i + 2) {
-            const operation = Object.keys(deserialize(bulkBody[i]))[0]
+            const operation = Object.keys(serializer.deserialize(bulkBody[i]))[0]
             onDrop({
               status: 429,
               error: null,
-              operation: deserialize(bulkBody[i]),
+              operation: serializer.deserialize(bulkBody[i]),
               document: operation !== 'delete'
-                ? deserialize(bulkBody[i + 1])
+                ? serializer.deserialize(bulkBody[i + 1])
                 /* istanbul ignore next */
                 : null,
               retried: isRetrying
@@ -676,7 +688,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
@@ -704,9 +716,9 @@ class Helpers {
                 onDrop({
                   status: status,
                   error: action[operation].error,
-                  operation: deserialize(bulkBody[indexSlice]),
+                  operation: serializer.deserialize(bulkBody[indexSlice]),
                   document: operation !== 'delete'
-                    ? deserialize(bulkBody[indexSlice + 1])
+                    ? serializer.deserialize(bulkBody[indexSlice + 1])
                     : null,
                   retried: isRetrying
                 })

package/lib/Serializer.d.ts

@@ -17,7 +17,12 @@
  * under the License.
  */
 
+export interface SerializerOptions {
+  disablePrototypePoisoningProtection: boolean | 'proto' | 'constructor'
+}
+
 export default class Serializer {
+  constructor (opts?: SerializerOptions)
   serialize(object: any): string;
   deserialize(json: string): any;
   ndserialize(array: any[]): string;

package/lib/Serializer.js

@@ -23,12 +23,22 @@ const { stringify } = require('querystring')
 const debug = require('debug')('elasticsearch')
 const sjson = require('secure-json-parse')
 const { SerializationError, DeserializationError } = require('./errors')
+const kJsonOptions = Symbol('secure json parse options')
 
 class Serializer {
+  constructor (opts = {}) {
+    const disable = opts.disablePrototypePoisoningProtection
+    this[kJsonOptions] = {
+      protoAction: disable === true || disable === 'proto' ? 'ignore' : 'error',
+      constructorAction: disable === true || disable === 'constructor' ? 'ignore' : 'error'
+    }
+  }
+
   serialize (object) {
     debug('Serializing', object)
+    let json
     try {
-      var json = JSON.stringify(object)
+      json = JSON.stringify(object)
     } catch (err) {
       throw new SerializationError(err.message, object)
     }
@@ -37,8 +47,9 @@ class Serializer {
 
   deserialize (json) {
     debug('Deserializing', json)
+    let object
     try {
-      var object = sjson.parse(json)
+      object = sjson.parse(json, this[kJsonOptions])
     } catch (err) {
       throw new DeserializationError(err.message, json)
     }
@@ -50,8 +61,8 @@ class Serializer {
     if (Array.isArray(array) === false) {
       throw new SerializationError('The argument provided is not an array')
     }
-    var ndjson = ''
-    for (var i = 0, len = array.length; i < len; i++) {
+    let ndjson = ''
+    for (let i = 0, len = array.length; i < len; i++) {
       if (typeof array[i] === 'string') {
         ndjson += array[i] + '\n'
       } else {
@@ -67,8 +78,8 @@ class Serializer {
     if (typeof object === 'string') return object
     // arrays should be serialized as comma separated list
     const keys = Object.keys(object)
-    for (var i = 0, len = keys.length; i < len; i++) {
-      var key = keys[i]
+    for (let i = 0, len = keys.length; i < len; i++) {
+      const key = keys[i]
       // elasticsearch will complain for keys without a value
       if (object[key] === undefined) {
         delete object[key]

package/lib/Transport.d.ts

@@ -28,7 +28,7 @@ export type ApiError = errors.ConfigurationError | errors.ConnectionError |
                        errors.NoLivingConnectionsError | errors.ResponseError |
                        errors.TimeoutError | errors.RequestAbortedError
 
-export type Context = Record<string, unknown> | null
+export type Context = unknown
 
 export interface nodeSelectorFn {
   (connections: Connection[]): Connection;
@@ -120,6 +120,7 @@ export interface TransportRequestCallback {
 
 export interface TransportRequestPromise<T> extends Promise<T> {
   abort: () => void;
+  finally(onFinally?: (() => void) | undefined | null): Promise<T>;
 }
 
 export interface TransportGetConnectionOptions {

package/lib/Transport.js

@@ -22,6 +22,7 @@
 const debug = require('debug')('elasticsearch')
 const os = require('os')
 const { gzip, unzip, createGzip } = require('zlib')
+const buffer = require('buffer')
 const ms = require('ms')
 const {
   ConnectionError,
@@ -35,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
@@ -87,7 +91,7 @@ class Transport {
       callback = options
       options = {}
     }
-    var p = null
+    let p = null
 
     // promises support
     if (callback === undefined) {
@@ -143,9 +147,10 @@ class Transport {
     // the size of the stream, we risk to take too much memory.
     // Furthermore, copying everytime the stream is very a expensive operation.
     const maxRetries = isStream(params.body) || isStream(params.bulkBody)
-      ? 0 : (typeof options.maxRetries === 'number' ? options.maxRetries : this.maxRetries)
+      ? 0
+      : (typeof options.maxRetries === 'number' ? options.maxRetries : this.maxRetries)
     const compression = options.compression !== undefined ? options.compression : this.compression
-    var request = { abort: noop }
+    let request = { abort: noop }
     const transportReturn = {
       then (onFulfilled, onRejected) {
         return p.then(onFulfilled, onRejected)
@@ -158,6 +163,9 @@ class Transport {
         request.abort()
         debug('Aborting request', params)
         return this
+      },
+      finally (onFinally) {
+        return p.finally(onFinally)
       }
     }
 
@@ -218,6 +226,22 @@ class Transport {
 
       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 ? [] : ''
@@ -249,6 +273,8 @@ class Transport {
       if (!isCompressed) {
         response.setEncoding('utf8')
       }
+
+      this.emit('deserialization', null, result)
       response.on('data', onData)
       response.on('error', onEnd)
       response.on('end', onEnd)
@@ -280,8 +306,8 @@ class Transport {
           return callback(err, result)
         }
       } else {
-        // cast to boolean if the request method was HEAD
-        result.body = isHead === true ? true : payload
+        // cast to boolean if the request method was HEAD and there was no error
+        result.body = isHead === true && result.statusCode < 400 ? true : payload
       }
 
       // we should ignore the statusCode if the user has configured the `ignore` field with
@@ -321,6 +347,7 @@ class Transport {
       }
     }
 
+    this.emit('serialization', null, result)
     const headers = Object.assign({}, this.headers, lowerCaseHeaders(options.headers))
 
     if (options.opaqueId !== undefined) {
@@ -335,6 +362,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
         }
@@ -350,6 +378,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
         }
@@ -389,6 +418,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
@@ -499,7 +529,7 @@ function defaultNodeFilter (node) {
 }
 
 function roundRobinSelector () {
-  var current = -1
+  let current = -1
   return function _roundRobinSelector (connections) {
     if (++current >= connections.length) {
       current = 0
@@ -514,8 +544,8 @@ function randomSelector (connections) {
 }
 
 function generateRequestId () {
-  var maxInt = 2147483647
-  var nextReqId = 0
+  const maxInt = 2147483647
+  let nextReqId = 0
   return function genReqId (params, options) {
     return (nextReqId = (nextReqId + 1) & maxInt)
   }

package/lib/errors.js

@@ -90,7 +90,16 @@ class ResponseError extends ElasticsearchClientError {
     super('Response Error')
     Error.captureStackTrace(this, ResponseError)
     this.name = 'ResponseError'
-    this.message = (meta.body && meta.body.error && meta.body.error.type) || 'Response Error'
+    if (meta.body && meta.body.error && meta.body.error.type) {
+      if (Array.isArray(meta.body.error.root_cause)) {
+        this.message = meta.body.error.type + ': '
+        this.message += meta.body.error.root_cause.map(entry => `[${entry.type}] Reason: ${entry.reason}`).join('; ')
+      } else {
+        this.message = meta.body.error.type
+      }
+    } else {
+      this.message = 'Response Error'
+    }
     this.meta = meta
   }
 
@@ -108,6 +117,10 @@ class ResponseError extends ElasticsearchClientError {
   get headers () {
     return this.meta.headers
   }
+
+  toString () {
+    return JSON.stringify(this.meta.body)
+  }
 }
 
 class RequestAbortedError extends ElasticsearchClientError {

package/lib/pool/BaseConnectionPool.js

@@ -128,7 +128,7 @@ class BaseConnectionPool {
    */
   empty (callback) {
     debug('Emptying the connection pool')
-    var openConnections = this.size
+    let openConnections = this.size
     this.connections.forEach(connection => {
       connection.close(() => {
         if (--openConnections === 0) {
@@ -201,7 +201,7 @@ class BaseConnectionPool {
     const ids = Object.keys(nodes)
     const hosts = []
 
-    for (var i = 0, len = ids.length; i < len; i++) {
+    for (let i = 0, len = ids.length; i < len; i++) {
       const node = nodes[ids[i]]
       // If there is no protocol in
       // the `publish_address` new URL will throw
@@ -210,7 +210,7 @@ class BaseConnectionPool {
       //   - hostname/ip:port
       // if we encounter the second case, we should
       // use the hostname instead of the ip
-      var address = node.http.publish_address
+      let address = node.http.publish_address
       const parts = address.split('/')
       // the url is in the form of hostname/ip:port
       if (parts.length > 1) {

package/lib/pool/ConnectionPool.js

@@ -80,7 +80,7 @@ class ConnectionPool extends BaseConnectionPool {
       // list a node that no longer exist. The following check verify
       // that the connection is still part of the pool before
       // marking it as dead.
-      for (var i = 0; i < this.size; i++) {
+      for (let i = 0; i < this.size; i++) {
         if (this.connections[i].id === id) {
           this.dead.push(id)
           break
@@ -138,7 +138,7 @@ class ConnectionPool extends BaseConnectionPool {
         path: '/',
         timeout: this.pingTimeout
       }, (err, response) => {
-        var isAlive = true
+        let isAlive = true
         const statusCode = response !== null ? response.statusCode : 0
         if (err != null ||
            (statusCode === 502 || statusCode === 503 || statusCode === 504)) {
@@ -170,8 +170,7 @@ class ConnectionPool extends BaseConnectionPool {
         isAlive: true,
         connection
       })
-      // eslint-disable-next-line standard/no-callback-literal
-      callback(true, connection)
+      callback(true, connection) // eslint-disable-line
     }
   }
 
@@ -199,7 +198,7 @@ class ConnectionPool extends BaseConnectionPool {
 
     // TODO: can we cache this?
     const connections = []
-    for (var i = 0; i < this.size; i++) {
+    for (let i = 0; i < this.size; i++) {
       const connection = this.connections[i]
       if (noAliveConnections || connection.status === Connection.statuses.ALIVE) {
         if (filter(connection) === true) {