From 070b9d75b939c99a552147e80336aff828318617 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 18 Oct 2021 13:21:37 +0300
Subject: [PATCH] pre-8.0 improvements (#1567)

---
 index.d.ts                                    |  3 +-
 index.js                                      | 34 +++++++++++++++++--
 package.json                                  |  2 +-
 src/api/kibana.ts                             |  6 ++--
 src/{Client.ts => client.ts}                  |  4 +--
 src/{Helpers.ts => helpers.ts}                |  5 +--
 ...ffingTransport.ts => sniffingTransport.ts} |  0
 7 files changed, 40 insertions(+), 14 deletions(-)
 rename src/{Client.ts => client.ts} (99%)
 rename src/{Helpers.ts => helpers.ts} (99%)
 rename src/{SniffingTransport.ts => sniffingTransport.ts} (100%)

diff --git a/index.d.ts b/index.d.ts
index 9faaea9b1..05de61f8d 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import Client from './lib/Client'
+import Client from './lib/client'
 
 export * from '@elastic/transport'
 export { Client }
+export type { ClientOptions, NodeOptions } from './lib/client'
diff --git a/index.js b/index.js
index 8a45b40a5..9b39327fb 100644
--- a/index.js
+++ b/index.js
@@ -19,7 +19,35 @@
 
 'use strict'
 
-const { errors } = require('@elastic/transport')
-const { default: Client } = require('./lib/Client')
+const {
+    Diagnostic,
+    Transport,
+    WeightedConnectionPool,
+    ClusterConnectionPool,
+    BaseConnectionPool,
+    CloudConnectionPool,
+    BaseConnection,
+    HttpConnection,
+    UndiciConnection,
+    Serializer,
+    errors,
+    events
+} = require('@elastic/transport')
 
-module.exports = { Client, errors }
+const { default: Client } = require('./lib/client')
+
+module.exports = { 
+    Client,
+    Diagnostic,
+    Transport,
+    WeightedConnectionPool,
+    ClusterConnectionPool,
+    BaseConnectionPool,
+    CloudConnectionPool,
+    BaseConnection,
+    HttpConnection,
+    UndiciConnection,
+    Serializer,
+    errors,
+    events
+}
diff --git a/package.json b/package.json
index 6bcaff965..b4a0c2eab 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "xmlbuilder2": "^3.0.2"
   },
   "dependencies": {
-    "@elastic/transport": "^0.0.7",
+    "@elastic/transport": "^0.0.9",
     "tslib": "^2.3.0"
   },
   "tap": {
diff --git a/src/api/kibana.ts b/src/api/kibana.ts
index fbd2b61b8..8d8e99013 100644
--- a/src/api/kibana.ts
+++ b/src/api/kibana.ts
@@ -35,9 +35,9 @@ import {
 } from '@elastic/transport'
 import * as T from './types'
 import * as TB from './typesWithBodyKey'
-import SniffingTransport from '../SniffingTransport'
-import Helpers from '../Helpers'
-import { ClientOptions } from '../Client'
+import SniffingTransport from '../sniffingTransport'
+import Helpers from '../helpers'
+import { ClientOptions } from '../client'
 
 interface KibanaClient {
   diagnostic: Diagnostic
diff --git a/src/Client.ts b/src/client.ts
similarity index 99%
rename from src/Client.ts
rename to src/client.ts
index 7c6e7768e..a22843c9e 100644
--- a/src/Client.ts
+++ b/src/client.ts
@@ -43,8 +43,8 @@ import {
   Context
 } from '@elastic/transport/lib/types'
 import BaseConnection, { prepareHeaders } from '@elastic/transport/lib/connection/BaseConnection'
-import SniffingTransport from './SniffingTransport'
-import Helpers from './Helpers'
+import SniffingTransport from './sniffingTransport'
+import Helpers from './helpers'
 import API from './api'
 
 const kChild = Symbol('elasticsearchjs-child')
diff --git a/src/Helpers.ts b/src/helpers.ts
similarity index 99%
rename from src/Helpers.ts
rename to src/helpers.ts
index ecb4f75b7..8c3e7c9c4 100644
--- a/src/Helpers.ts
+++ b/src/helpers.ts
@@ -24,7 +24,7 @@ import assert from 'assert'
 import { promisify } from 'util'
 import { Readable } from 'stream'
 import { errors, TransportResult, TransportRequestOptions, TransportRequestOptionsWithMeta } from '@elastic/transport'
-import Client from './Client'
+import Client from './client'
 import * as T from './api/types'
 
 export interface HelpersOptions {
@@ -194,7 +194,6 @@ export default class Helpers {
     }
     assert(response !== undefined, 'The response is undefined, please file a bug report')
     if (response.statusCode === 429) {
-      // @ts-expect-error
       throw new ResponseError(response)
     }
 
@@ -235,7 +234,6 @@ export default class Helpers {
         await sleep(wait)
       }
       if (response.statusCode === 429) {
-        // @ts-expect-error
         throw new ResponseError(response)
       }
     }
@@ -498,7 +496,6 @@ export default class Helpers {
               // @ts-expect-error
               addDocumentsGetter(result)
               if (response.status != null && response.status >= 400) {
-                // @ts-expect-error
                 callbacks[i](new ResponseError(result), result)
               } else {
                 callbacks[i](null, result)
diff --git a/src/SniffingTransport.ts b/src/sniffingTransport.ts
similarity index 100%
rename from src/SniffingTransport.ts
rename to src/sniffingTransport.ts