@clickhouse/client 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  /// <reference types="node" />
4
- import type { ConnBaseQueryParams, ConnCommandResult, Connection, ConnectionParams, ConnExecResult, ConnInsertParams, ConnInsertResult, ConnPingResult, ConnQueryResult } from '@clickhouse/client-common';
4
+ import type { BaseQueryParams, ConnBaseQueryParams, ConnCommandResult, Connection, ConnectionParams, ConnExecResult, ConnInsertParams, ConnInsertResult, ConnPingResult, ConnQueryResult } from '@clickhouse/client-common';
5
5
  import type Http from 'http';
6
6
  import Stream from 'stream';
7
7
  export type NodeConnectionParams = ConnectionParams & {
@@ -23,6 +23,7 @@ export type TLSParams = {
23
23
  export interface RequestParams {
24
24
  method: 'GET' | 'POST';
25
25
  url: URL;
26
+ headers: Http.OutgoingHttpHeaders;
26
27
  body?: string | Stream.Readable;
27
28
  abort_signal: AbortSignal;
28
29
  decompress_response?: boolean;
@@ -32,7 +33,9 @@ export interface RequestParams {
32
33
  export declare abstract class NodeBaseConnection implements Connection<Stream.Readable> {
33
34
  protected readonly params: NodeConnectionParams;
34
35
  protected readonly agent: Http.Agent;
35
- protected readonly headers: Http.OutgoingHttpHeaders;
36
+ protected readonly defaultAuthHeader: string;
37
+ protected readonly defaultHeaders: Http.OutgoingHttpHeaders;
38
+ protected readonly additionalHTTPHeaders: Record<string, string>;
36
39
  private readonly logger;
37
40
  private readonly knownSockets;
38
41
  private readonly idleSocketTTL;
@@ -43,7 +46,7 @@ export declare abstract class NodeBaseConnection implements Connection<Stream.Re
43
46
  exec(params: ConnBaseQueryParams): Promise<ConnExecResult<Stream.Readable>>;
44
47
  command(params: ConnBaseQueryParams): Promise<ConnCommandResult>;
45
48
  close(): Promise<void>;
46
- protected buildDefaultHeaders(username: string, password: string, additional_http_headers?: Record<string, string>): Http.OutgoingHttpHeaders;
49
+ protected buildRequestHeaders(params?: BaseQueryParams): Http.OutgoingHttpHeaders;
47
50
  protected abstract createClientRequest(params: RequestParams): Http.ClientRequest;
48
51
  private getQueryId;
49
52
  private getAbortController;
@@ -25,7 +25,19 @@ class NodeBaseConnection {
25
25
  writable: true,
26
26
  value: agent
27
27
  });
28
- Object.defineProperty(this, "headers", {
28
+ Object.defineProperty(this, "defaultAuthHeader", {
29
+ enumerable: true,
30
+ configurable: true,
31
+ writable: true,
32
+ value: void 0
33
+ });
34
+ Object.defineProperty(this, "defaultHeaders", {
35
+ enumerable: true,
36
+ configurable: true,
37
+ writable: true,
38
+ value: void 0
39
+ });
40
+ Object.defineProperty(this, "additionalHTTPHeaders", {
29
41
  enumerable: true,
30
42
  configurable: true,
31
43
  writable: true,
@@ -49,9 +61,16 @@ class NodeBaseConnection {
49
61
  writable: true,
50
62
  value: void 0
51
63
  });
64
+ this.additionalHTTPHeaders = params.http_headers ?? {};
65
+ this.defaultAuthHeader = `Basic ${Buffer.from(`${params.username}:${params.password}`).toString('base64')}`;
66
+ this.defaultHeaders = {
67
+ ...this.additionalHTTPHeaders,
68
+ // KeepAlive agent for some reason does not set this on its own
69
+ Connection: this.params.keep_alive.enabled ? 'keep-alive' : 'close',
70
+ 'User-Agent': (0, utils_1.getUserAgent)(this.params.application_id),
71
+ };
52
72
  this.logger = params.log_writer;
53
73
  this.idleSocketTTL = params.keep_alive.idle_socket_ttl;
54
- this.headers = this.buildDefaultHeaders(params.username, params.password, params.http_headers);
55
74
  }
56
75
  async ping() {
57
76
  const abortController = new AbortController();
@@ -60,6 +79,7 @@ class NodeBaseConnection {
60
79
  method: 'GET',
61
80
  url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/ping' }),
62
81
  abort_signal: abortController.signal,
82
+ headers: this.buildRequestHeaders(),
63
83
  }, 'Ping');
64
84
  await (0, stream_2.drainStream)(stream);
65
85
  return { success: true };
@@ -98,6 +118,7 @@ class NodeBaseConnection {
98
118
  body: params.query,
99
119
  abort_signal: controller.signal,
100
120
  decompress_response: decompressResponse,
121
+ headers: this.buildRequestHeaders(params),
101
122
  }, 'Query');
102
123
  return {
103
124
  stream,
@@ -142,6 +163,7 @@ class NodeBaseConnection {
142
163
  abort_signal: controller.signal,
143
164
  compress_request: this.params.compression.compress_request,
144
165
  parse_summary: true,
166
+ headers: this.buildRequestHeaders(params),
145
167
  }, 'Insert');
146
168
  await (0, stream_2.drainStream)(stream);
147
169
  return { query_id, summary };
@@ -184,13 +206,12 @@ class NodeBaseConnection {
184
206
  this.agent.destroy();
185
207
  }
186
208
  }
187
- buildDefaultHeaders(username, password, additional_http_headers) {
209
+ buildRequestHeaders(params) {
188
210
  return {
189
- // KeepAlive agent for some reason does not set this on its own
190
- Connection: this.params.keep_alive.enabled ? 'keep-alive' : 'close',
191
- Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
192
- 'User-Agent': (0, utils_1.getUserAgent)(this.params.application_id),
193
- ...additional_http_headers,
211
+ ...this.defaultHeaders,
212
+ Authorization: params?.auth !== undefined
213
+ ? `Basic ${Buffer.from(`${params.auth.username}:${params.auth.password}`).toString('base64')}`
214
+ : this.defaultAuthHeader,
194
215
  };
195
216
  }
196
217
  getQueryId(query_id) {
@@ -279,6 +300,7 @@ class NodeBaseConnection {
279
300
  body: params.query,
280
301
  abort_signal: controller.signal,
281
302
  parse_summary: true,
303
+ headers: this.buildRequestHeaders(params),
282
304
  }, params.op);
283
305
  return {
284
306
  stream,
@@ -1 +1 @@
1
- {"version":3,"file":"node_base_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_base_connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node_base_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_base_connection.ts"],"names":[],"mappings":"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"}
@@ -16,16 +16,17 @@ class NodeHttpConnection extends node_base_connection_1.NodeBaseConnection {
16
16
  super(params, agent);
17
17
  }
18
18
  createClientRequest(params) {
19
+ const headers = (0, client_common_1.withCompressionHeaders)({
20
+ headers: params.headers,
21
+ compress_request: params.compress_request,
22
+ decompress_response: params.decompress_response,
23
+ });
19
24
  return http_1.default.request(params.url, {
20
25
  method: params.method,
21
26
  agent: this.agent,
22
27
  timeout: this.params.request_timeout,
23
- headers: (0, client_common_1.withCompressionHeaders)({
24
- headers: this.headers,
25
- compress_request: params.compress_request,
26
- decompress_response: params.decompress_response,
27
- }),
28
28
  signal: params.abort_signal,
29
+ headers,
29
30
  });
30
31
  }
31
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"node_http_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_http_connection.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAkE;AAClE,gDAAuB;AAKvB,iEAA2D;AAE3D,MAAa,kBAAmB,SAAQ,yCAAkB;IACxD,YAAY,MAA4B;QACtC,MAAM,KAAK,GAAG,IAAI,cAAI,CAAC,KAAK,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;SACxC,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,OAAO,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACpC,OAAO,EAAE,IAAA,sCAAsB,EAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;aAChD,CAAC;YACF,MAAM,EAAE,MAAM,CAAC,YAAY;SAC5B,CAAC,CAAA;IACJ,CAAC;CACF;AAtBD,gDAsBC"}
1
+ {"version":3,"file":"node_http_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_http_connection.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAkE;AAClE,gDAAuB;AAKvB,iEAA2D;AAE3D,MAAa,kBAAmB,SAAQ,yCAAkB;IACxD,YAAY,MAA4B;QACtC,MAAM,KAAK,GAAG,IAAI,cAAI,CAAC,KAAK,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;SACxC,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,MAAM,OAAO,GAAG,IAAA,sCAAsB,EAAC;YACrC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;SAChD,CAAC,CAAA;QACF,OAAO,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACpC,MAAM,EAAE,MAAM,CAAC,YAAY;YAC3B,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAvBD,gDAuBC"}
@@ -1,9 +1,10 @@
1
1
  /// <reference types="node" />
2
+ import type { BaseQueryParams } from '@clickhouse/client-common';
2
3
  import type Http from 'http';
3
4
  import type { NodeConnectionParams, RequestParams } from './node_base_connection';
4
5
  import { NodeBaseConnection } from './node_base_connection';
5
6
  export declare class NodeHttpsConnection extends NodeBaseConnection {
6
7
  constructor(params: NodeConnectionParams);
7
- protected buildDefaultHeaders(username: string, password: string, additional_headers?: Record<string, string>): Http.OutgoingHttpHeaders;
8
+ protected buildRequestHeaders(params?: BaseQueryParams): Http.OutgoingHttpHeaders;
8
9
  protected createClientRequest(params: RequestParams): Http.ClientRequest;
9
10
  }
@@ -18,33 +18,40 @@ class NodeHttpsConnection extends node_base_connection_1.NodeBaseConnection {
18
18
  });
19
19
  super(params, agent);
20
20
  }
21
- buildDefaultHeaders(username, password, additional_headers) {
22
- if (this.params.tls?.type === 'Mutual') {
23
- return {
24
- 'X-ClickHouse-User': username,
25
- 'X-ClickHouse-Key': password,
26
- 'X-ClickHouse-SSL-Certificate-Auth': 'on',
21
+ buildRequestHeaders(params) {
22
+ if (this.params.tls !== undefined) {
23
+ const headers = {
24
+ ...this.defaultHeaders,
25
+ 'X-ClickHouse-User': params?.auth?.username ?? this.params.username,
26
+ 'X-ClickHouse-Key': params?.auth?.password ?? this.params.password,
27
27
  };
28
+ const tlsType = this.params.tls.type;
29
+ switch (tlsType) {
30
+ case 'Basic':
31
+ return headers;
32
+ case 'Mutual':
33
+ return {
34
+ ...headers,
35
+ 'X-ClickHouse-SSL-Certificate-Auth': 'on',
36
+ };
37
+ default:
38
+ throw new Error(`Unknown TLS type: ${tlsType}`);
39
+ }
28
40
  }
29
- if (this.params.tls?.type === 'Basic') {
30
- return {
31
- 'X-ClickHouse-User': username,
32
- 'X-ClickHouse-Key': password,
33
- };
34
- }
35
- return super.buildDefaultHeaders(username, password, additional_headers);
41
+ return super.buildRequestHeaders(params);
36
42
  }
37
43
  createClientRequest(params) {
44
+ const headers = (0, client_common_1.withCompressionHeaders)({
45
+ headers: params.headers,
46
+ compress_request: params.compress_request,
47
+ decompress_response: params.decompress_response,
48
+ });
38
49
  return https_1.default.request(params.url, {
39
50
  method: params.method,
40
51
  agent: this.agent,
41
52
  timeout: this.params.request_timeout,
42
- headers: (0, client_common_1.withCompressionHeaders)({
43
- headers: this.headers,
44
- compress_request: params.compress_request,
45
- decompress_response: params.decompress_response,
46
- }),
47
53
  signal: params.abort_signal,
54
+ headers,
48
55
  });
49
56
  }
50
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"node_https_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_https_connection.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAkE;AAElE,kDAAyB;AAKzB,iEAA2D;AAE3D,MAAa,mBAAoB,SAAQ,yCAAkB;IACzD,YAAY,MAA4B;QACtC,MAAM,KAAK,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;YACvC,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO;YACvB,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAC/D,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SAClE,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAEkB,mBAAmB,CACpC,QAAgB,EAChB,QAAgB,EAChB,kBAA2C;QAE3C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;gBAC5B,mCAAmC,EAAE,IAAI;aAC1C,CAAA;QACH,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;YACtC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;aAC7B,CAAA;QACH,CAAC;QACD,OAAO,KAAK,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAA;IAC1E,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,OAAO,eAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACpC,OAAO,EAAE,IAAA,sCAAsB,EAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;aAChD,CAAC;YACF,MAAM,EAAE,MAAM,CAAC,YAAY;SAC5B,CAAC,CAAA;IACJ,CAAC;CACF;AA9CD,kDA8CC"}
1
+ {"version":3,"file":"node_https_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_https_connection.ts"],"names":[],"mappings":";;;;;;AACA,6DAAkE;AAElE,kDAAyB;AAKzB,iEAA2D;AAE3D,MAAa,mBAAoB,SAAQ,yCAAkB;IACzD,YAAY,MAA4B;QACtC,MAAM,KAAK,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO;YACpC,UAAU,EAAE,MAAM,CAAC,oBAAoB;YACvC,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO;YACvB,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAC/D,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SAClE,CAAC,CAAA;QACF,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAEkB,mBAAmB,CACpC,MAAwB;QAExB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,OAAO,GAA6B;gBACxC,GAAG,IAAI,CAAC,cAAc;gBACtB,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ;gBACnE,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ;aACnE,CAAA;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAA;YACpC,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,OAAO;oBACV,OAAO,OAAO,CAAA;gBAChB,KAAK,QAAQ;oBACX,OAAO;wBACL,GAAG,OAAO;wBACV,mCAAmC,EAAE,IAAI;qBAC1C,CAAA;gBACH;oBACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAES,mBAAmB,CAAC,MAAqB;QACjD,MAAM,OAAO,GAAG,IAAA,sCAAsB,EAAC;YACrC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;SAChD,CAAC,CAAA;QACF,OAAO,eAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACpC,MAAM,EAAE,MAAM,CAAC,YAAY;YAC3B,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAnDD,kDAmDC"}
package/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- declare const _default: "1.0.2";
1
+ declare const _default: "1.1.0";
2
2
  export default _default;
package/dist/version.js CHANGED
@@ -1,4 +1,4 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = '1.0.2';
3
+ exports.default = '1.1.0';
4
4
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@clickhouse/client",
3
3
  "description": "Official JS client for ClickHouse DB - Node.js implementation",
4
4
  "homepage": "https://clickhouse.com",
5
- "version": "1.0.2",
5
+ "version": "1.1.0",
6
6
  "license": "Apache-2.0",
7
7
  "keywords": [
8
8
  "clickhouse",
@@ -23,6 +23,6 @@
23
23
  "dist"
24
24
  ],
25
25
  "dependencies": {
26
- "@clickhouse/client-common": "1.0.2"
26
+ "@clickhouse/client-common": "1.1.0"
27
27
  }
28
28
  }