@clickhouse/client 0.2.10 → 0.3.0-beta.1

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.
package/dist/client.d.ts CHANGED
@@ -10,19 +10,10 @@ export type NodeClickHouseClientConfigOptions = BaseClickHouseClientConfigOption
10
10
  keep_alive?: {
11
11
  /** Enable or disable HTTP Keep-Alive mechanism. Default: true */
12
12
  enabled?: boolean;
13
- /** How long to keep a particular open socket alive
14
- * on the client side (in milliseconds).
15
- * Should be less than the server setting
16
- * (see `keep_alive_timeout` in server's `config.xml`).
17
- * Currently, has no effect if {@link retry_on_expired_socket}
18
- * is unset or false. Default value: 2500
19
- * (based on the default ClickHouse server setting, which is 3000) */
20
- socket_ttl?: number;
21
- /** If the client detects a potentially expired socket based on the
22
- * {@link socket_ttl}, this socket will be immediately destroyed
23
- * before sending the request, and this request will be retried
24
- * with a new socket up to 3 times. Default: false (no retries) */
25
- retry_on_expired_socket?: boolean;
13
+ /** For how long keep a particular idle socket alive on the client side (in milliseconds).
14
+ * It is supposed to be a fair bit less that the ClickHouse server KeepAlive timeout, which is by default 3000 ms.
15
+ * Default value: 2500 */
16
+ idle_socket_ttl?: number;
26
17
  };
27
18
  };
28
19
  interface BasicTLSOptions {
package/dist/client.js CHANGED
@@ -23,8 +23,7 @@ function createClient(config) {
23
23
  }
24
24
  const keep_alive = {
25
25
  enabled: config?.keep_alive?.enabled ?? true,
26
- socket_ttl: config?.keep_alive?.socket_ttl ?? 2500,
27
- retry_on_expired_socket: config?.keep_alive?.retry_on_expired_socket ?? false,
26
+ idle_socket_ttl: config?.keep_alive?.idle_socket_ttl ?? 2500,
28
27
  };
29
28
  return new client_common_1.ClickHouseClient({
30
29
  impl: {
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../packages/client-node/src/client.ts"],"names":[],"mappings":";;;AAMA,6DAA4D;AAG5D,6CAAsE;AACtE,6CAAwC;AACxC,mCAA2C;AAmC3C,SAAgB,YAAY,CAC1B,MAA0C;IAE1C,IAAI,GAAG,GAA0B,SAAS,CAAA;IAC1C,IAAI,MAAM,EAAE,GAAG,EAAE;QACf,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,IAAI,KAAK,IAAI,MAAM,CAAC,GAAG,EAAE;YAC/C,GAAG,GAAG;gBACJ,IAAI,EAAE,QAAQ;gBACd,GAAG,MAAM,CAAC,GAAG;aACd,CAAA;SACF;aAAM;YACL,GAAG,GAAG;gBACJ,IAAI,EAAE,OAAO;gBACb,GAAG,MAAM,CAAC,GAAG;aACd,CAAA;SACF;KACF;IACD,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,IAAI,IAAI;QAC5C,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,IAAI,IAAI;QAClD,uBAAuB,EACrB,MAAM,EAAE,UAAU,EAAE,uBAAuB,IAAI,KAAK;KACvD,CAAA;IACD,OAAO,IAAI,gCAAgB,CAAC;QAC1B,IAAI,EAAE;YACJ,eAAe,EAAE,CAAC,MAAwB,EAAE,EAAE;gBAC5C,QAAQ,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC3B,KAAK,OAAO;wBACV,OAAO,IAAI,+BAAkB,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;oBAC1D,KAAK,QAAQ;wBACX,OAAO,IAAI,gCAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAA;oBAChE;wBACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;iBACzD;YACH,CAAC;YACD,eAAe,EAAE,CACf,MAAuB,EACvB,MAAkB,EAClB,UAAkB,EAClB,EAAE,CAAC,IAAI,sBAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;YAC9C,cAAc,EAAE,IAAI,yBAAiB,EAAE;YACvC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC7B,MAAM,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;SACF;QACD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;KAClB,CAAC,CAAA;AACJ,CAAC;AA/CD,oCA+CC;AAED,SAAgB,gBAAgB,CAC9B,MAA4B;IAE5B,oCAAoC;IACpC,QAAQ,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC3B,KAAK,OAAO;YACV,OAAO,IAAI,+BAAkB,CAAC,MAAM,CAAC,CAAA;QACvC,KAAK,QAAQ;YACX,OAAO,IAAI,gCAAmB,CAAC,MAAM,CAAC,CAAA;QACxC;YACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;KACzD;AACH,CAAC;AAZD,4CAYC"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../packages/client-node/src/client.ts"],"names":[],"mappings":";;;AAMA,6DAA4D;AAG5D,6CAAsE;AACtE,6CAAwC;AACxC,mCAA2C;AA0B3C,SAAgB,YAAY,CAC1B,MAA0C;IAE1C,IAAI,GAAG,GAA0B,SAAS,CAAA;IAC1C,IAAI,MAAM,EAAE,GAAG,EAAE;QACf,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,IAAI,KAAK,IAAI,MAAM,CAAC,GAAG,EAAE;YAC/C,GAAG,GAAG;gBACJ,IAAI,EAAE,QAAQ;gBACd,GAAG,MAAM,CAAC,GAAG;aACd,CAAA;SACF;aAAM;YACL,GAAG,GAAG;gBACJ,IAAI,EAAE,OAAO;gBACb,GAAG,MAAM,CAAC,GAAG;aACd,CAAA;SACF;KACF;IACD,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,IAAI,IAAI;QAC5C,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,IAAI,IAAI;KAC7D,CAAA;IACD,OAAO,IAAI,gCAAgB,CAAC;QAC1B,IAAI,EAAE;YACJ,eAAe,EAAE,CAAC,MAAwB,EAAE,EAAE;gBAC5C,QAAQ,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC3B,KAAK,OAAO;wBACV,OAAO,IAAI,+BAAkB,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;oBAC1D,KAAK,QAAQ;wBACX,OAAO,IAAI,gCAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAA;oBAChE;wBACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;iBACzD;YACH,CAAC;YACD,eAAe,EAAE,CACf,MAAuB,EACvB,MAAkB,EAClB,UAAkB,EAClB,EAAE,CAAC,IAAI,sBAAS,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;YAC9C,cAAc,EAAE,IAAI,yBAAiB,EAAE;YACvC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC7B,MAAM,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;SACF;QACD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;KAClB,CAAC,CAAA;AACJ,CAAC;AA7CD,oCA6CC;AAED,SAAgB,gBAAgB,CAC9B,MAA4B;IAE5B,oCAAoC;IACpC,QAAQ,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC3B,KAAK,OAAO;YACV,OAAO,IAAI,+BAAkB,CAAC,MAAM,CAAC,CAAA;QACvC,KAAK,QAAQ;YACX,OAAO,IAAI,gCAAmB,CAAC,MAAM,CAAC,CAAA;QACxC;YACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;KACzD;AACH,CAAC;AAZD,4CAYC"}
@@ -0,0 +1,12 @@
1
+ /// <reference types="node" />
2
+ /// <reference types="node" />
3
+ import type Http from 'http';
4
+ import Stream from 'stream';
5
+ export declare function decompressResponse(response: Http.IncomingMessage): {
6
+ response: Stream.Readable;
7
+ } | {
8
+ error: Error;
9
+ };
10
+ export declare function isDecompressionError(result: any): result is {
11
+ error: Error;
12
+ };
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.isDecompressionError = exports.decompressResponse = void 0;
7
+ const stream_1 = __importDefault(require("stream"));
8
+ const zlib_1 = __importDefault(require("zlib"));
9
+ function decompressResponse(response) {
10
+ const encoding = response.headers['content-encoding'];
11
+ if (encoding === 'gzip') {
12
+ return {
13
+ response: stream_1.default.pipeline(response, zlib_1.default.createGunzip(), function pipelineCb(err) {
14
+ if (err) {
15
+ console.error(err);
16
+ }
17
+ }),
18
+ };
19
+ }
20
+ else if (encoding !== undefined) {
21
+ return {
22
+ error: new Error(`Unexpected encoding: ${encoding}`),
23
+ };
24
+ }
25
+ return { response };
26
+ }
27
+ exports.decompressResponse = decompressResponse;
28
+ function isDecompressionError(result) {
29
+ return result.error !== undefined;
30
+ }
31
+ exports.isDecompressionError = isDecompressionError;
32
+ //# sourceMappingURL=compression.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compression.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/compression.ts"],"names":[],"mappings":";;;;;;AACA,oDAA2B;AAC3B,gDAAuB;AAEvB,SAAgB,kBAAkB,CAAC,QAA8B;IAK/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAErD,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,OAAO;YACL,QAAQ,EAAE,gBAAM,CAAC,QAAQ,CACvB,QAAQ,EACR,cAAI,CAAC,YAAY,EAAE,EACnB,SAAS,UAAU,CAAC,GAAG;gBACrB,IAAI,GAAG,EAAE;oBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;iBACnB;YACH,CAAC,CACF;SACF,CAAA;KACF;SAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;QACjC,OAAO;YACL,KAAK,EAAE,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC;SACrD,CAAA;KACF;IAED,OAAO,EAAE,QAAQ,EAAE,CAAA;AACrB,CAAC;AA1BD,gDA0BC;AAED,SAAgB,oBAAoB,CAAC,MAAW;IAC9C,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,CAAA;AACnC,CAAC;AAFD,oDAEC"}
@@ -8,8 +8,7 @@ export type NodeConnectionParams = ConnectionParams & {
8
8
  tls?: TLSParams;
9
9
  keep_alive: {
10
10
  enabled: boolean;
11
- socket_ttl: number;
12
- retry_on_expired_socket: boolean;
11
+ idle_socket_ttl: number;
13
12
  };
14
13
  };
15
14
  export type TLSParams = {
@@ -25,7 +24,7 @@ export interface RequestParams {
25
24
  method: 'GET' | 'POST';
26
25
  url: URL;
27
26
  body?: string | Stream.Readable;
28
- abort_signal?: AbortSignal;
27
+ abort_signal: AbortSignal;
29
28
  decompress_response?: boolean;
30
29
  compress_request?: boolean;
31
30
  parse_summary?: boolean;
@@ -35,19 +34,21 @@ export declare abstract class NodeBaseConnection implements Connection<Stream.Re
35
34
  protected readonly agent: Http.Agent;
36
35
  protected readonly headers: Http.OutgoingHttpHeaders;
37
36
  private readonly logger;
38
- private readonly retry_expired_sockets;
39
- private readonly known_sockets;
37
+ private readonly knownSockets;
38
+ private readonly idleSocketTTL;
40
39
  protected constructor(params: NodeConnectionParams, agent: Http.Agent);
41
40
  protected buildDefaultHeaders(username: string, password: string, additional_headers?: Record<string, string>): Http.OutgoingHttpHeaders;
42
41
  protected abstract createClientRequest(params: RequestParams): Http.ClientRequest;
43
42
  private request;
44
- private _request;
45
43
  ping(): Promise<ConnPingResult>;
46
44
  query(params: ConnBaseQueryParams): Promise<ConnQueryResult<Stream.Readable>>;
47
45
  exec(params: ConnBaseQueryParams): Promise<ConnExecResult<Stream.Readable>>;
48
46
  insert(params: ConnInsertParams<Stream.Readable>): Promise<ConnInsertResult>;
49
47
  close(): Promise<void>;
48
+ private getQueryId;
49
+ private getAbortController;
50
50
  private logResponse;
51
- private drainHttpResponse;
51
+ private logRequestError;
52
+ private httpRequestErrorMessage;
52
53
  private parseSummary;
53
54
  }
@@ -9,7 +9,8 @@ const crypto_1 = __importDefault(require("crypto"));
9
9
  const stream_1 = __importDefault(require("stream"));
10
10
  const zlib_1 = __importDefault(require("zlib"));
11
11
  const utils_1 = require("../utils");
12
- const expiredSocketMessage = 'expired socket';
12
+ const compression_1 = require("./compression");
13
+ const stream_2 = require("./stream");
13
14
  class NodeBaseConnection {
14
15
  constructor(params, agent) {
15
16
  Object.defineProperty(this, "params", {
@@ -36,51 +37,32 @@ class NodeBaseConnection {
36
37
  writable: true,
37
38
  value: void 0
38
39
  });
39
- Object.defineProperty(this, "retry_expired_sockets", {
40
+ Object.defineProperty(this, "knownSockets", {
40
41
  enumerable: true,
41
42
  configurable: true,
42
43
  writable: true,
43
- value: void 0
44
+ value: new WeakMap()
44
45
  });
45
- Object.defineProperty(this, "known_sockets", {
46
+ Object.defineProperty(this, "idleSocketTTL", {
46
47
  enumerable: true,
47
48
  configurable: true,
48
49
  writable: true,
49
- value: new WeakMap()
50
+ value: void 0
50
51
  });
51
- this.logger = params.logWriter;
52
- this.retry_expired_sockets =
53
- params.keep_alive.enabled && params.keep_alive.retry_on_expired_socket;
52
+ this.logger = params.log_writer;
53
+ this.idleSocketTTL = params.keep_alive.idle_socket_ttl;
54
54
  this.headers = this.buildDefaultHeaders(params.username, params.password, params.additional_headers);
55
55
  }
56
56
  buildDefaultHeaders(username, password, additional_headers) {
57
57
  return {
58
+ // KeepAlive agent for some reason does not set this on its own
59
+ Connection: this.params.keep_alive.enabled ? 'keep-alive' : 'close',
58
60
  Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
59
61
  'User-Agent': (0, utils_1.getUserAgent)(this.params.application_id),
60
62
  ...additional_headers,
61
63
  };
62
64
  }
63
- async request(params, retryCount = 0) {
64
- try {
65
- return await this._request(params);
66
- }
67
- catch (e) {
68
- if (e instanceof Error && e.message === expiredSocketMessage) {
69
- if (this.retry_expired_sockets && retryCount < 3) {
70
- this.logger.trace({
71
- module: 'Connection',
72
- message: `Keep-Alive socket is expired, retrying with a new one, retries so far: ${retryCount}`,
73
- });
74
- return await this.request(params, retryCount + 1);
75
- }
76
- else {
77
- throw new Error(`Socket hang up after ${retryCount} retries`);
78
- }
79
- }
80
- throw e;
81
- }
82
- }
83
- async _request(params) {
65
+ async request(params, op) {
84
66
  return new Promise((resolve, reject) => {
85
67
  const start = Date.now();
86
68
  const request = this.createClientRequest(params);
@@ -89,16 +71,16 @@ class NodeBaseConnection {
89
71
  reject(err);
90
72
  }
91
73
  const onResponse = async (_response) => {
92
- this.logResponse(request, params, _response, start);
93
- const decompressionResult = decompressResponse(_response);
94
- if (isDecompressionError(decompressionResult)) {
74
+ this.logResponse(op, request, params, _response, start);
75
+ const decompressionResult = (0, compression_1.decompressResponse)(_response);
76
+ if ((0, compression_1.isDecompressionError)(decompressionResult)) {
95
77
  return reject(decompressionResult.error);
96
78
  }
97
79
  if ((0, client_common_1.isSuccessfulResponse)(_response.statusCode)) {
98
80
  return resolve({
99
81
  stream: decompressionResult.response,
100
82
  summary: params.parse_summary
101
- ? this.parseSummary(_response)
83
+ ? this.parseSummary(op, _response)
102
84
  : undefined,
103
85
  });
104
86
  }
@@ -146,62 +128,67 @@ class NodeBaseConnection {
146
128
  }
147
129
  }
148
130
  const onSocket = (socket) => {
149
- if (this.retry_expired_sockets) {
150
- // if socket is reused
151
- const socketInfo = this.known_sockets.get(socket);
152
- if (socketInfo !== undefined) {
131
+ if (this.params.keep_alive.enabled) {
132
+ const socketInfo = this.knownSockets.get(socket);
133
+ // It is the first time we encounter this socket,
134
+ // so it doesn't have the idle timeout handler attached to it
135
+ if (socketInfo === undefined) {
136
+ const socketId = crypto_1.default.randomUUID();
153
137
  this.logger.trace({
154
- module: 'Connection',
155
- message: `Reused socket ${socketInfo.id}`,
138
+ message: `Using a fresh socket ${socketId}, setting up a new 'free' listener`,
139
+ });
140
+ this.knownSockets.set(socket, {
141
+ id: socketId,
142
+ idle_timeout_handle: undefined,
156
143
  });
157
- // if a socket was reused at an unfortunate time,
158
- // and is likely about to expire
159
- const isPossiblyExpired = Date.now() - socketInfo.last_used_time >
160
- this.params.keep_alive.socket_ttl;
161
- if (isPossiblyExpired) {
144
+ // When the request is complete and the socket is released,
145
+ // make sure that the socket is removed after `idleSocketTTL`.
146
+ socket.on('free', () => {
162
147
  this.logger.trace({
163
- module: 'Connection',
164
- message: 'Socket should be expired - terminate it',
148
+ message: `Socket ${socketId} was released`,
165
149
  });
166
- this.known_sockets.delete(socket);
167
- socket.destroy(); // immediately terminate the connection
168
- request.destroy();
169
- reject(new Error(expiredSocketMessage));
170
- }
171
- else {
172
- this.logger.trace({
173
- module: 'Connection',
174
- message: `Socket ${socketInfo.id} is safe to be reused`,
150
+ // Avoiding the built-in socket.timeout() method usage here,
151
+ // as we don't want to clash with the actual request timeout.
152
+ const idleTimeoutHandle = setTimeout(() => {
153
+ this.logger.trace({
154
+ message: `Removing socket ${socketId} after ${this.idleSocketTTL} ms of idle`,
155
+ });
156
+ this.knownSockets.delete(socket);
157
+ socket.destroy();
158
+ }, this.idleSocketTTL).unref();
159
+ this.knownSockets.set(socket, {
160
+ id: socketId,
161
+ idle_timeout_handle: idleTimeoutHandle,
175
162
  });
176
- this.known_sockets.set(socket, {
177
- id: socketInfo.id,
178
- last_used_time: Date.now(),
163
+ });
164
+ const cleanup = () => {
165
+ const maybeSocketInfo = this.knownSockets.get(socket);
166
+ // clean up a possibly dangling idle timeout handle (preventing leaks)
167
+ if (maybeSocketInfo?.idle_timeout_handle) {
168
+ clearTimeout(maybeSocketInfo.idle_timeout_handle);
169
+ }
170
+ this.logger.trace({
171
+ message: `Socket ${socketId} was closed or ended, 'free' listener removed`,
179
172
  });
180
- pipeStream();
181
- }
173
+ };
174
+ socket.once('end', cleanup);
175
+ socket.once('close', cleanup);
182
176
  }
183
177
  else {
184
- const socketId = crypto_1.default.randomUUID();
178
+ clearTimeout(socketInfo.idle_timeout_handle);
185
179
  this.logger.trace({
186
- module: 'Connection',
187
- message: `Using a new socket ${socketId}`,
180
+ message: `Reusing socket ${socketInfo.id}`,
188
181
  });
189
- this.known_sockets.set(socket, {
190
- id: socketId,
191
- last_used_time: Date.now(),
182
+ this.knownSockets.set(socket, {
183
+ ...socketInfo,
184
+ idle_timeout_handle: undefined,
192
185
  });
193
- pipeStream();
194
186
  }
195
187
  }
196
- else {
197
- // no need to track the reused sockets;
198
- // keep alive is disabled or retry mechanism is not enabled
199
- pipeStream();
200
- }
201
- // this is for request timeout only.
202
- // The socket won't be actually destroyed,
203
- // and it will be returned to the pool.
204
- // TODO: investigate if can actually remove the idle sockets properly
188
+ // Socket is "prepared" with idle handlers, continue with our request
189
+ pipeStream();
190
+ // This is for request timeout only. Surprisingly, it is not always enough to set in the HTTP request.
191
+ // The socket won't be actually destroyed, and it will be returned to the pool.
205
192
  socket.setTimeout(this.params.request_timeout, onTimeout);
206
193
  };
207
194
  function onTimeout() {
@@ -234,26 +221,33 @@ class NodeBaseConnection {
234
221
  });
235
222
  }
236
223
  async ping() {
224
+ const abortController = new AbortController();
237
225
  try {
238
226
  const { stream } = await this.request({
239
227
  method: 'GET',
240
228
  url: (0, client_common_1.transformUrl)({ url: this.params.url, pathname: '/ping' }),
241
- });
242
- stream.destroy();
229
+ abort_signal: abortController.signal,
230
+ }, 'Ping');
231
+ await (0, stream_2.drainStream)(stream);
243
232
  return { success: true };
244
233
  }
245
234
  catch (error) {
246
- if (error instanceof Error) {
247
- return {
248
- success: false,
249
- error,
250
- };
251
- }
252
- throw error; // should never happen
235
+ // it is used to ensure that the outgoing request is terminated,
236
+ // and we don't get an unhandled error propagation later
237
+ abortController.abort('Ping failed');
238
+ // not an error, as this might be semi-expected
239
+ this.logger.warn({
240
+ message: this.httpRequestErrorMessage('Ping'),
241
+ err: error,
242
+ });
243
+ return {
244
+ success: false,
245
+ error: error, // should NOT be propagated to the user
246
+ };
253
247
  }
254
248
  }
255
249
  async query(params) {
256
- const query_id = getQueryId(params.query_id);
250
+ const query_id = this.getQueryId(params.query_id);
257
251
  const clickhouse_settings = (0, client_common_1.withHttpSettings)(params.clickhouse_settings, this.params.compression.decompress_response);
258
252
  const searchParams = (0, client_common_1.toSearchParams)({
259
253
  database: this.params.database,
@@ -262,20 +256,42 @@ class NodeBaseConnection {
262
256
  session_id: params.session_id,
263
257
  query_id,
264
258
  });
265
- const { stream } = await this.request({
266
- method: 'POST',
267
- url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
268
- body: params.query,
269
- abort_signal: params.abort_signal,
270
- decompress_response: clickhouse_settings.enable_http_compression === 1,
271
- });
272
- return {
273
- stream,
274
- query_id,
275
- };
259
+ const decompressResponse = clickhouse_settings.enable_http_compression === 1;
260
+ const { controller, controllerCleanup } = this.getAbortController(params);
261
+ try {
262
+ const { stream } = await this.request({
263
+ method: 'POST',
264
+ url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
265
+ body: params.query,
266
+ abort_signal: controller.signal,
267
+ decompress_response: decompressResponse,
268
+ }, 'Query');
269
+ return {
270
+ stream,
271
+ query_id,
272
+ };
273
+ }
274
+ catch (err) {
275
+ controller.abort('Query HTTP request failed');
276
+ this.logRequestError({
277
+ op: 'Query',
278
+ query_id: query_id,
279
+ query_params: params,
280
+ search_params: searchParams,
281
+ err: err,
282
+ extra_args: {
283
+ decompress_response: decompressResponse,
284
+ clickhouse_settings,
285
+ },
286
+ });
287
+ throw err; // should be propagated to the user
288
+ }
289
+ finally {
290
+ controllerCleanup();
291
+ }
276
292
  }
277
293
  async exec(params) {
278
- const query_id = getQueryId(params.query_id);
294
+ const query_id = this.getQueryId(params.query_id);
279
295
  const searchParams = (0, client_common_1.toSearchParams)({
280
296
  database: this.params.database,
281
297
  clickhouse_settings: params.clickhouse_settings,
@@ -283,21 +299,41 @@ class NodeBaseConnection {
283
299
  session_id: params.session_id,
284
300
  query_id,
285
301
  });
286
- const { stream, summary } = await this.request({
287
- method: 'POST',
288
- url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
289
- body: params.query,
290
- abort_signal: params.abort_signal,
291
- parse_summary: true,
292
- });
293
- return {
294
- stream,
295
- query_id,
296
- summary,
297
- };
302
+ const { controller, controllerCleanup } = this.getAbortController(params);
303
+ try {
304
+ const { stream, summary } = await this.request({
305
+ method: 'POST',
306
+ url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
307
+ body: params.query,
308
+ abort_signal: controller.signal,
309
+ parse_summary: true,
310
+ }, 'Exec');
311
+ return {
312
+ stream,
313
+ query_id,
314
+ summary,
315
+ };
316
+ }
317
+ catch (err) {
318
+ controller.abort('Exec HTTP request failed');
319
+ this.logRequestError({
320
+ op: 'Exec',
321
+ query_id: query_id,
322
+ query_params: params,
323
+ search_params: searchParams,
324
+ err: err,
325
+ extra_args: {
326
+ clickhouse_settings: params.clickhouse_settings ?? {},
327
+ },
328
+ });
329
+ throw err; // should be propagated to the user
330
+ }
331
+ finally {
332
+ controllerCleanup();
333
+ }
298
334
  }
299
335
  async insert(params) {
300
- const query_id = getQueryId(params.query_id);
336
+ const query_id = this.getQueryId(params.query_id);
301
337
  const searchParams = (0, client_common_1.toSearchParams)({
302
338
  database: this.params.database,
303
339
  clickhouse_settings: params.clickhouse_settings,
@@ -306,29 +342,66 @@ class NodeBaseConnection {
306
342
  session_id: params.session_id,
307
343
  query_id,
308
344
  });
309
- const { stream, summary } = await this.request({
310
- method: 'POST',
311
- url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
312
- body: params.values,
313
- abort_signal: params.abort_signal,
314
- compress_request: this.params.compression.compress_request,
315
- parse_summary: true,
316
- });
317
- await this.drainHttpResponse(stream);
318
- return { query_id, summary };
345
+ const { controller, controllerCleanup } = this.getAbortController(params);
346
+ try {
347
+ const { stream, summary } = await this.request({
348
+ method: 'POST',
349
+ url: (0, client_common_1.transformUrl)({ url: this.params.url, searchParams }),
350
+ body: params.values,
351
+ abort_signal: controller.signal,
352
+ compress_request: this.params.compression.compress_request,
353
+ parse_summary: true,
354
+ }, 'Insert');
355
+ await (0, stream_2.drainStream)(stream);
356
+ return { query_id, summary };
357
+ }
358
+ catch (err) {
359
+ controller.abort('Insert HTTP request failed');
360
+ this.logRequestError({
361
+ op: 'Insert',
362
+ query_id: query_id,
363
+ query_params: params,
364
+ search_params: searchParams,
365
+ err: err,
366
+ extra_args: {
367
+ clickhouse_settings: params.clickhouse_settings ?? {},
368
+ },
369
+ });
370
+ throw err; // should be propagated to the user
371
+ }
372
+ finally {
373
+ controllerCleanup();
374
+ }
319
375
  }
320
376
  async close() {
321
377
  if (this.agent !== undefined && this.agent.destroy !== undefined) {
322
378
  this.agent.destroy();
323
379
  }
324
380
  }
325
- logResponse(request, params, response, startTimestamp) {
381
+ getQueryId(query_id) {
382
+ return query_id || crypto_1.default.randomUUID();
383
+ }
384
+ // a wrapper over the user's Signal to terminate the failed requests
385
+ getAbortController(params) {
386
+ const controller = new AbortController();
387
+ function onAbort() {
388
+ controller.abort();
389
+ }
390
+ params.abort_signal?.addEventListener('abort', onAbort);
391
+ return {
392
+ controller,
393
+ controllerCleanup: () => {
394
+ params.abort_signal?.removeEventListener('abort', onAbort);
395
+ },
396
+ };
397
+ }
398
+ logResponse(op, request, params, response, startTimestamp) {
326
399
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
327
400
  const { authorization, host, ...headers } = request.getHeaders();
328
401
  const duration = Date.now() - startTimestamp;
329
- this.params.logWriter.debug({
402
+ this.params.log_writer.debug({
330
403
  module: 'HTTP Adapter',
331
- message: 'Got a response from ClickHouse',
404
+ message: `${op}: got a response from ClickHouse`,
332
405
  args: {
333
406
  request_method: params.method,
334
407
  request_path: params.url.pathname,
@@ -340,35 +413,24 @@ class NodeBaseConnection {
340
413
  },
341
414
  });
342
415
  }
343
- async drainHttpResponse(stream) {
344
- return new Promise((resolve, reject) => {
345
- function dropData() {
346
- // We don't care about the data
347
- }
348
- function onEnd() {
349
- removeListeners();
350
- resolve();
351
- }
352
- function onError(err) {
353
- removeListeners();
354
- reject(err);
355
- }
356
- function onClose() {
357
- removeListeners();
358
- }
359
- function removeListeners() {
360
- stream.removeListener('data', dropData);
361
- stream.removeListener('end', onEnd);
362
- stream.removeListener('error', onError);
363
- stream.removeListener('onClose', onClose);
364
- }
365
- stream.on('data', dropData);
366
- stream.on('end', onEnd);
367
- stream.on('error', onError);
368
- stream.on('close', onClose);
416
+ logRequestError({ op, err, query_id, query_params, search_params, extra_args, }) {
417
+ this.logger.error({
418
+ message: this.httpRequestErrorMessage(op),
419
+ err: err,
420
+ args: {
421
+ query: query_params.query,
422
+ search_params: search_params?.toString() ?? '',
423
+ with_abort_signal: query_params.abort_signal !== undefined,
424
+ session_id: query_params.session_id,
425
+ query_id: query_id,
426
+ ...extra_args,
427
+ },
369
428
  });
370
429
  }
371
- parseSummary(response) {
430
+ httpRequestErrorMessage(op) {
431
+ return `${op}: HTTP request error.`;
432
+ }
433
+ parseSummary(op, response) {
372
434
  const summaryHeader = response.headers['x-clickhouse-summary'];
373
435
  if (typeof summaryHeader === 'string') {
374
436
  try {
@@ -376,8 +438,10 @@ class NodeBaseConnection {
376
438
  }
377
439
  catch (err) {
378
440
  this.logger.error({
379
- module: 'Connection',
380
- message: `Failed to parse X-ClickHouse-Summary header, got: ${summaryHeader}`,
441
+ message: `${op}: failed to parse X-ClickHouse-Summary header.`,
442
+ args: {
443
+ 'X-ClickHouse-Summary': summaryHeader,
444
+ },
381
445
  err: err,
382
446
  });
383
447
  }
@@ -385,28 +449,4 @@ class NodeBaseConnection {
385
449
  }
386
450
  }
387
451
  exports.NodeBaseConnection = NodeBaseConnection;
388
- function decompressResponse(response) {
389
- const encoding = response.headers['content-encoding'];
390
- if (encoding === 'gzip') {
391
- return {
392
- response: stream_1.default.pipeline(response, zlib_1.default.createGunzip(), function pipelineCb(err) {
393
- if (err) {
394
- console.error(err);
395
- }
396
- }),
397
- };
398
- }
399
- else if (encoding !== undefined) {
400
- return {
401
- error: new Error(`Unexpected encoding: ${encoding}`),
402
- };
403
- }
404
- return { response };
405
- }
406
- function isDecompressionError(result) {
407
- return result.error !== undefined;
408
- }
409
- function getQueryId(query_id) {
410
- return query_id || crypto_1.default.randomUUID();
411
- }
412
452
  //# sourceMappingURL=node_base_connection.js.map
@@ -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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"}
@@ -19,6 +19,7 @@ class NodeHttpConnection extends node_base_connection_1.NodeBaseConnection {
19
19
  return http_1.default.request(params.url, {
20
20
  method: params.method,
21
21
  agent: this.agent,
22
+ timeout: this.params.request_timeout,
22
23
  headers: (0, client_common_1.withCompressionHeaders)({
23
24
  headers: this.headers,
24
25
  compress_request: params.compress_request,
@@ -1 +1 @@
1
- {"version":3,"file":"node_http_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_http_connection.ts"],"names":[],"mappings":";;;;;;AACA,6DAAkE;AAClE,gDAAuB;AAMvB,iEAA2D;AAE3D,MAAa,kBACX,SAAQ,yCAAkB;IAG1B,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,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;AAxBD,gDAwBC"}
1
+ {"version":3,"file":"node_http_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/node_http_connection.ts"],"names":[],"mappings":";;;;;;AACA,6DAAkE;AAClE,gDAAuB;AAMvB,iEAA2D;AAE3D,MAAa,kBACX,SAAQ,yCAAkB;IAG1B,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;AAzBD,gDAyBC"}
@@ -38,6 +38,7 @@ class NodeHttpsConnection extends node_base_connection_1.NodeBaseConnection {
38
38
  return https_1.default.request(params.url, {
39
39
  method: params.method,
40
40
  agent: this.agent,
41
+ timeout: this.params.request_timeout,
41
42
  headers: (0, client_common_1.withCompressionHeaders)({
42
43
  headers: this.headers,
43
44
  compress_request: params.compress_request,
@@ -1 +1 @@
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;AAMzB,iEAA2D;AAE3D,MAAa,mBACX,SAAQ,yCAAkB;IAG1B,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;YACtC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;gBAC5B,mCAAmC,EAAE,IAAI;aAC1C,CAAA;SACF;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,EAAE;YACrC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;aAC7B,CAAA;SACF;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,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;AAhDD,kDAgDC"}
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;AAMzB,iEAA2D;AAE3D,MAAa,mBACX,SAAQ,yCAAkB;IAG1B,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;YACtC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;gBAC5B,mCAAmC,EAAE,IAAI;aAC1C,CAAA;SACF;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,EAAE;YACrC,OAAO;gBACL,mBAAmB,EAAE,QAAQ;gBAC7B,kBAAkB,EAAE,QAAQ;aAC7B,CAAA;SACF;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;AAjDD,kDAiDC"}
@@ -0,0 +1,4 @@
1
+ /// <reference types="node" />
2
+ import type Stream from 'stream';
3
+ /** See https://github.com/ClickHouse/clickhouse-js/pull/203 */
4
+ export declare function drainStream(stream: Stream.Readable): Promise<void>;
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.drainStream = void 0;
4
+ /** See https://github.com/ClickHouse/clickhouse-js/pull/203 */
5
+ async function drainStream(stream) {
6
+ return new Promise((resolve, reject) => {
7
+ function dropData() {
8
+ // used only for the methods without expected response; we don't care about the data here
9
+ }
10
+ function onEnd() {
11
+ removeListeners();
12
+ resolve();
13
+ }
14
+ function onError(err) {
15
+ removeListeners();
16
+ reject(err);
17
+ }
18
+ function onClose() {
19
+ removeListeners();
20
+ }
21
+ function removeListeners() {
22
+ stream.removeListener('data', dropData);
23
+ stream.removeListener('end', onEnd);
24
+ stream.removeListener('error', onError);
25
+ stream.removeListener('onClose', onClose);
26
+ }
27
+ stream.on('data', dropData);
28
+ stream.on('end', onEnd);
29
+ stream.on('error', onError);
30
+ stream.on('close', onClose);
31
+ });
32
+ }
33
+ exports.drainStream = drainStream;
34
+ //# sourceMappingURL=stream.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/stream.ts"],"names":[],"mappings":";;;AAEA,+DAA+D;AACxD,KAAK,UAAU,WAAW,CAAC,MAAuB;IACvD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,QAAQ;YACf,yFAAyF;QAC3F,CAAC;QAED,SAAS,KAAK;YACZ,eAAe,EAAE,CAAA;YACjB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,SAAS,OAAO,CAAC,GAAU;YACzB,eAAe,EAAE,CAAA;YACjB,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC;QAED,SAAS,OAAO;YACd,eAAe,EAAE,CAAA;QACnB,CAAC;QAED,SAAS,eAAe;YACtB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACnC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACvC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACvB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC;AAhCD,kCAgCC"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export { createConnection, createClient } from './client';
2
2
  export { ResultSet } from './result_set';
3
3
  /** Re-export @clickhouse/client-common types */
4
- export { type BaseClickHouseClientConfigOptions, type ClickHouseClientConfigOptions, type BaseQueryParams, type QueryParams, type ExecParams, type InsertParams, type InsertValues, type CommandParams, type CommandResult, type ExecResult, type InsertResult, type DataFormat, type ErrorLogParams, type Logger, type LogParams, type ClickHouseSettings, type MergeTreeSettings, type Row, type ResponseJSON, type InputJSON, type InputJSONObjectEachRow, type BaseResultSet, type PingResult, ClickHouseError, ClickHouseLogLevel, ClickHouseClient, SettingsMap, } from '@clickhouse/client-common';
4
+ export { type BaseClickHouseClientConfigOptions, type ClickHouseClientConfigOptions, type BaseQueryParams, type QueryParams, type ExecParams, type InsertParams, type InsertValues, type CommandParams, type CommandResult, type ExecResult, type InsertResult, type DataFormat, type Logger, type LogParams, type ErrorLogParams, type WarnLogParams, type ClickHouseSettings, type MergeTreeSettings, type Row, type ResponseJSON, type InputJSON, type InputJSONObjectEachRow, type BaseResultSet, type PingResult, ClickHouseError, ClickHouseLogLevel, ClickHouseClient, SettingsMap, } from '@clickhouse/client-common';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/client-node/src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAhD,0GAAA,gBAAgB,OAAA;AAAE,sGAAA,YAAY,OAAA;AACvC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,gDAAgD;AAChD,2DA4BkC;AAJhC,gHAAA,eAAe,OAAA;AACf,mHAAA,kBAAkB,OAAA;AAClB,iHAAA,gBAAgB,OAAA;AAChB,4GAAA,WAAW,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/client-node/src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAhD,0GAAA,gBAAgB,OAAA;AAAE,sGAAA,YAAY,OAAA;AACvC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,gDAAgD;AAChD,2DA6BkC;AAJhC,gHAAA,eAAe,OAAA;AACf,mHAAA,kBAAkB,OAAA;AAClB,iHAAA,gBAAgB,OAAA;AAChB,4GAAA,WAAW,OAAA"}
package/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- declare const _default: "0.2.10";
1
+ declare const _default: "0.3.0-beta.1";
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 = '0.2.10';
3
+ exports.default = '0.3.0-beta.1';
4
4
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../../packages/client-node/src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,QAAQ,CAAA"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../../packages/client-node/src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,cAAc,CAAA"}
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": "0.2.10",
5
+ "version": "0.3.0-beta.1",
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": "0.2.10"
26
+ "@clickhouse/client-common": "0.3.0-beta.1"
27
27
  }
28
28
  }