796644fc0c
In very few cases, some API uses the same key for both url and query params, such as the bulk method. The client is not designed to handle such cases since accepts both url and query keys in the same object, and the url parameter will always take precedence. This pr fixes this edge case by adding a `querystring` key in the options object. Fixes: https://github.com/elastic/elasticsearch-js/pull/778 ```js client.bulk({ index: 'index', type: '_doc', body: [...] }, { querystring: { type: '_doc' } }, console.log) ```
114 lines
2.8 KiB
TypeScript
114 lines
2.8 KiB
TypeScript
/*
|
|
* 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'
|
|
|
|
import {
|
|
Client,
|
|
ApiResponse,
|
|
RequestEvent,
|
|
ResurrectEvent,
|
|
events,
|
|
ClientExtendsCallbackOptions
|
|
} from '../../index'
|
|
|
|
import { TransportRequestParams, TransportRequestOptions } from '../../lib/Transport'
|
|
|
|
const client = new Client({ node: 'http://localhost:9200' })
|
|
|
|
client.on(events.RESPONSE, (err: Error | null, request: RequestEvent) => {
|
|
if (err) console.log(err)
|
|
const { body, statusCode } = request
|
|
const { params } = request.meta.request
|
|
console.log(params, body, statusCode)
|
|
})
|
|
client.on(events.RESURRECT, (err: Error | null, meta: ResurrectEvent) => {})
|
|
|
|
// Callbacks
|
|
client.info((err: Error | null, result: ApiResponse) => {})
|
|
|
|
client.index({
|
|
index: 'test',
|
|
type: 'test',
|
|
id: 'test',
|
|
body: { hello: 'world' }
|
|
}, (err: Error | null, result: ApiResponse) => {})
|
|
|
|
// request options
|
|
client.index({
|
|
index: 'test',
|
|
type: 'test',
|
|
id: 'test',
|
|
body: { hello: 'world' }
|
|
}, {
|
|
maxRetries: 2,
|
|
ignore: [404],
|
|
requestTimeout: 2000,
|
|
headers: { foo: 'bar' },
|
|
querystring: { baz: 'faz' },
|
|
compression: 'gzip',
|
|
asStream: false
|
|
}, (err: Error | null, result: ApiResponse) => {})
|
|
|
|
// Promises
|
|
client.info()
|
|
.then((result: ApiResponse) => {})
|
|
.catch((err: Error) => {})
|
|
|
|
client.index({
|
|
index: 'test',
|
|
type: 'test',
|
|
id: 'test',
|
|
body: { hello: 'world' }
|
|
})
|
|
.then((result: ApiResponse) => {})
|
|
.catch((err: Error) => {})
|
|
|
|
// request options
|
|
client.index({
|
|
index: 'test',
|
|
type: 'test',
|
|
id: 'test',
|
|
body: { hello: 'world' }
|
|
}, {
|
|
maxRetries: 2,
|
|
ignore: [404],
|
|
requestTimeout: 2000
|
|
})
|
|
.then((result: ApiResponse) => {})
|
|
.catch((err: Error) => {})
|
|
|
|
// extend client
|
|
client.extend('namespace.method', (options: ClientExtendsCallbackOptions) => {
|
|
return function (params: any) {
|
|
const requestParams: TransportRequestParams = {
|
|
method: 'GET',
|
|
path: '/',
|
|
querystring: {}
|
|
}
|
|
|
|
const requestOptions: TransportRequestOptions = {
|
|
ignore: [404],
|
|
maxRetries: 5
|
|
}
|
|
|
|
return options.makeRequest(requestParams, requestOptions)
|
|
}
|
|
})
|