wip

Author: delvedor

src/Client.ts

@@ -43,6 +43,8 @@ import {
 } from '@elastic/transport/lib/types'
 import BaseConnection, { prepareHeaders } from '@elastic/transport/lib/connection/BaseConnection'
 import SniffingTransport from './SniffingTransport'
+import Helpers from './Helpers'
+import API from './api'
 
 const kChild = Symbol('elasticsearchjs-child')
 const kInitialOptions = Symbol('elasticsearchjs-initial-options')
@@ -109,13 +111,15 @@ interface ClientOptions {
   caFingerprint?: string
 }
 
-export default class Client {
+export default class Client extends API {
   diagnostic: Diagnostic
   name: string | symbol
   connectionPool: BaseConnectionPool
   transport: SniffingTransport
   serializer: Serializer
+  helpers: Helpers
   constructor (opts: ClientOptions) {
+    super()
     // @ts-expect-error kChild symbol is for internal use only
     if ((opts.cloud != null) && opts[kChild] === undefined) {
       const { id } = opts.cloud
@@ -213,6 +217,7 @@ export default class Client {
       })
       this.connectionPool.addConnection(options.node ?? options.nodes)
     }
+
     this.transport = new options.Transport({
       diagnostic: this.diagnostic,
       connectionPool: this.connectionPool,
@@ -233,6 +238,14 @@ export default class Client {
       context: options.context,
       productCheck: 'Elasticsearch'
     })
+
+    this.helpers = new Helpers({
+      client: this,
+      metaHeader: options.enableMetaHeader
+        ? `es=${clientVersion},js=${nodeVersion},t=${transportVersion},hc=${nodeVersion}`
+        : null,
+      maxRetries: options.maxRetries
+    })
   }
 
   child (opts: ClientOptions): Client {

src/Helpers.ts

@@ -21,7 +21,7 @@ import Client from './Client'
 
 export interface HelpersOptions {
   client: Client
-  metaHeader: string
+  metaHeader: string | null
   maxRetries: number
 }
 
@@ -31,7 +31,7 @@ const kMaxRetries = Symbol('max retries')
 
 export default class Helpers {
   [kClient]: Client
-  [kMetaHeader]: string
+  [kMetaHeader]: string | null
   [kMaxRetries]: number
   constructor (opts: HelpersOptions) {
     this[kClient] = opts.client

test/unit/client.test.ts

@@ -25,15 +25,11 @@ import * as symbols from '@elastic/transport/lib/symbols'
 import { BaseConnectionPool, CloudConnectionPool, WeightedConnectionPool } from '@elastic/transport'
 
 let clientVersion: string = require('../../package.json').version // eslint-disable-line
-/* istanbul ignore next */
 if (clientVersion.includes('-')) {
-  // clean prerelease
   clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
 }
 let transportVersion: string = require('@elastic/transport/package.json').version // eslint-disable-line
-/* istanbul ignore next */
 if (transportVersion.includes('-')) {
-  // clean prerelease
   transportVersion = transportVersion.slice(0, transportVersion.indexOf('-')) + 'p'
 }
 const nodeVersion = process.versions.node