@clickhouse/client 1.12.0 → 1.13.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.
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/connection/create_connection.d.ts +4 -1
- package/dist/connection/create_connection.js +30 -25
- package/dist/connection/create_connection.js.map +1 -1
- package/dist/result_set.d.ts +2 -8
- package/dist/result_set.js +43 -44
- package/dist/result_set.js.map +1 -1
- package/dist/utils/runtime.d.ts +6 -0
- package/dist/utils/runtime.js +65 -0
- package/dist/utils/runtime.js.map +1 -0
- package/dist/utils/user_agent.d.ts +4 -0
- package/dist/utils/user_agent.js +6 -39
- package/dist/utils/user_agent.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -2
package/dist/config.js
CHANGED
|
@@ -58,7 +58,7 @@ exports.NodeConfigImpl = {
|
|
|
58
58
|
enabled: nodeConfig?.keep_alive?.enabled ?? true,
|
|
59
59
|
idle_socket_ttl: nodeConfig?.keep_alive?.idle_socket_ttl ?? 2500,
|
|
60
60
|
};
|
|
61
|
-
return
|
|
61
|
+
return connection_1.NodeConnectionFactory.create({
|
|
62
62
|
connection_params: params,
|
|
63
63
|
set_basic_auth_header: nodeConfig.set_basic_auth_header ?? true,
|
|
64
64
|
capture_enhanced_stack_trace: nodeConfig.capture_enhanced_stack_trace ?? false,
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../packages/client-node/src/config.ts"],"names":[],"mappings":";;;AAKA,6DAIkC;AAIlC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../packages/client-node/src/config.ts"],"names":[],"mappings":";;;AAKA,6DAIkC;AAIlC,6CAAoE;AACpE,6CAAwC;AACxC,mCAA2C;AAmD9B,QAAA,cAAc,GAEvB;IACF,0BAA0B,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,UAAU,GAAsC,EAAE,GAAG,MAAM,EAAE,CAAA;QACnE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAA;QACvC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAA;QACvC,MAAM,mBAAmB,GAAG,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;QACxD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClC,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAW,CAAA;gBACjD,QAAQ,GAAG,EAAE,CAAC;oBACZ,KAAK,4BAA4B;wBAC/B,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;4BACxC,UAAU,CAAC,UAAU,GAAG,EAAE,CAAA;wBAC5B,CAAC;wBACD,UAAU,CAAC,UAAU,CAAC,eAAe,GAAG,IAAA,oCAAoB,EAAC;4BAC3D,GAAG;4BACH,KAAK;4BACL,GAAG,EAAE,CAAC;yBACP,CAAC,CAAA;wBACF,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;wBACtB,MAAK;oBACP;wBACE,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAC1B,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,UAAU;YAClB,cAAc,EAAE,aAAa;YAC7B,cAAc,EAAE,aAAa;SAC9B,CAAA;IACH,CAAC;IACD,eAAe,EAAE,CACf,UAA6C,EAC7C,MAAwB,EACxB,EAAE;QACF,IAAI,GAAG,GAA0B,SAAS,CAAA;QAC1C,IAAI,UAAU,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,MAAM,IAAI,UAAU,CAAC,GAAG,IAAI,KAAK,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;gBACxD,GAAG,GAAG;oBACJ,IAAI,EAAE,QAAQ;oBACd,GAAG,UAAU,CAAC,GAAG;iBAClB,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG;oBACJ,IAAI,EAAE,OAAO;oBACb,GAAG,UAAU,CAAC,GAAG;iBAClB,CAAA;YACH,CAAC;QACH,CAAC;QACD,iEAAiE;QACjE,MAAM,UAAU,GAAG;YACjB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,IAAI,IAAI;YAChD,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,IAAI,IAAI;SACjE,CAAA;QACD,OAAO,kCAAqB,CAAC,MAAM,CAAC;YAClC,iBAAiB,EAAE,MAAM;YACzB,qBAAqB,EAAE,UAAU,CAAC,qBAAqB,IAAI,IAAI;YAC/D,4BAA4B,EAC1B,UAAU,CAAC,4BAA4B,IAAI,KAAK;YAClD,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,UAAU;YACV,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC;IACD,cAAc,EAAE,IAAI,yBAAiB,EAAE;IACvC,eAAe,EAAE,CAAC,CAChB,MAAuB,EACvB,MAAkB,EAClB,QAAgB,EAChB,SAA+B,EAC/B,gBAAiC,EACjC,EAAE,CACF,sBAAS,CAAC,QAAQ,CAAC;QACjB,MAAM;QACN,MAAM;QACN,QAAQ;QACR,SAAS;QACT,gBAAgB;KACjB,CAAC,CAAQ;CACb,CAAA"}
|
|
@@ -10,4 +10,7 @@ export interface CreateConnectionParams {
|
|
|
10
10
|
set_basic_auth_header: boolean;
|
|
11
11
|
capture_enhanced_stack_trace: boolean;
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
/** A factory for easier mocking after Node.js 22.18 */
|
|
14
|
+
export declare class NodeConnectionFactory {
|
|
15
|
+
static create({ connection_params, tls, keep_alive, http_agent, set_basic_auth_header, capture_enhanced_stack_trace, }: CreateConnectionParams): NodeBaseConnection;
|
|
16
|
+
}
|
|
@@ -1,37 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.NodeConnectionFactory = void 0;
|
|
4
4
|
const node_custom_agent_connection_1 = require("./node_custom_agent_connection");
|
|
5
5
|
const node_http_connection_1 = require("./node_http_connection");
|
|
6
6
|
const node_https_connection_1 = require("./node_https_connection");
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
keep_alive, // only used to enforce proper KeepAlive headers
|
|
14
|
-
http_agent,
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
switch (connection_params.url.protocol) {
|
|
18
|
-
case 'http:':
|
|
19
|
-
return new node_http_connection_1.NodeHttpConnection({
|
|
20
|
-
...connection_params,
|
|
21
|
-
set_basic_auth_header,
|
|
22
|
-
capture_enhanced_stack_trace,
|
|
23
|
-
keep_alive,
|
|
24
|
-
});
|
|
25
|
-
case 'https:':
|
|
26
|
-
return new node_https_connection_1.NodeHttpsConnection({
|
|
7
|
+
/** A factory for easier mocking after Node.js 22.18 */
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-extraneous-class
|
|
9
|
+
class NodeConnectionFactory {
|
|
10
|
+
static create({ connection_params, tls, keep_alive, http_agent, set_basic_auth_header, capture_enhanced_stack_trace, }) {
|
|
11
|
+
if (http_agent !== undefined) {
|
|
12
|
+
return new node_custom_agent_connection_1.NodeCustomAgentConnection({
|
|
27
13
|
...connection_params,
|
|
28
14
|
set_basic_auth_header,
|
|
29
15
|
capture_enhanced_stack_trace,
|
|
30
|
-
keep_alive,
|
|
31
|
-
|
|
16
|
+
keep_alive, // only used to enforce proper KeepAlive headers
|
|
17
|
+
http_agent,
|
|
32
18
|
});
|
|
33
|
-
|
|
34
|
-
|
|
19
|
+
}
|
|
20
|
+
switch (connection_params.url.protocol) {
|
|
21
|
+
case 'http:':
|
|
22
|
+
return new node_http_connection_1.NodeHttpConnection({
|
|
23
|
+
...connection_params,
|
|
24
|
+
set_basic_auth_header,
|
|
25
|
+
capture_enhanced_stack_trace,
|
|
26
|
+
keep_alive,
|
|
27
|
+
});
|
|
28
|
+
case 'https:':
|
|
29
|
+
return new node_https_connection_1.NodeHttpsConnection({
|
|
30
|
+
...connection_params,
|
|
31
|
+
set_basic_auth_header,
|
|
32
|
+
capture_enhanced_stack_trace,
|
|
33
|
+
keep_alive,
|
|
34
|
+
tls,
|
|
35
|
+
});
|
|
36
|
+
default:
|
|
37
|
+
throw new Error('Only HTTP and HTTPS protocols are supported');
|
|
38
|
+
}
|
|
35
39
|
}
|
|
36
40
|
}
|
|
41
|
+
exports.NodeConnectionFactory = NodeConnectionFactory;
|
|
37
42
|
//# sourceMappingURL=create_connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/create_connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create_connection.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/create_connection.ts"],"names":[],"mappings":";;;AAOA,iFAA0E;AAC1E,iEAA2D;AAC3D,mEAA6D;AAW7D,uDAAuD;AACvD,kEAAkE;AAClE,MAAa,qBAAqB;IAChC,MAAM,CAAC,MAAM,CAAC,EACZ,iBAAiB,EACjB,GAAG,EACH,UAAU,EACV,UAAU,EACV,qBAAqB,EACrB,4BAA4B,GACL;QACvB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,wDAAyB,CAAC;gBACnC,GAAG,iBAAiB;gBACpB,qBAAqB;gBACrB,4BAA4B;gBAC5B,UAAU,EAAE,gDAAgD;gBAC5D,UAAU;aACX,CAAC,CAAA;QACJ,CAAC;QACD,QAAQ,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACvC,KAAK,OAAO;gBACV,OAAO,IAAI,yCAAkB,CAAC;oBAC5B,GAAG,iBAAiB;oBACpB,qBAAqB;oBACrB,4BAA4B;oBAC5B,UAAU;iBACX,CAAC,CAAA;YACJ,KAAK,QAAQ;gBACX,OAAO,IAAI,2CAAmB,CAAC;oBAC7B,GAAG,iBAAiB;oBACpB,qBAAqB;oBACrB,4BAA4B;oBAC5B,UAAU;oBACV,GAAG;iBACJ,CAAC,CAAA;YACJ;gBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;CACF;AAtCD,sDAsCC"}
|
package/dist/result_set.d.ts
CHANGED
|
@@ -6,16 +6,9 @@ import Stream from 'stream';
|
|
|
6
6
|
export type StreamReadable<T> = Omit<Stream.Readable, 'on'> & {
|
|
7
7
|
[Symbol.asyncIterator](): NodeJS.AsyncIterator<T>;
|
|
8
8
|
on(event: 'data', listener: (chunk: T) => void): Stream.Readable;
|
|
9
|
-
on(event: 'close', listener: () => void): Stream.Readable;
|
|
10
|
-
on(event: 'drain', listener: () => void): Stream.Readable;
|
|
11
|
-
on(event: 'end', listener: () => void): Stream.Readable;
|
|
9
|
+
on(event: 'close' | 'drain' | 'end' | 'finish' | 'pause' | 'readable' | 'resume' | 'unpipe', listener: () => void): Stream.Readable;
|
|
12
10
|
on(event: 'error', listener: (err: Error) => void): Stream.Readable;
|
|
13
|
-
on(event: 'finish', listener: () => void): Stream.Readable;
|
|
14
|
-
on(event: 'pause', listener: () => void): Stream.Readable;
|
|
15
11
|
on(event: 'pipe', listener: (src: Readable) => void): Stream.Readable;
|
|
16
|
-
on(event: 'readable', listener: () => void): Stream.Readable;
|
|
17
|
-
on(event: 'resume', listener: () => void): Stream.Readable;
|
|
18
|
-
on(event: 'unpipe', listener: (src: Readable) => void): Stream.Readable;
|
|
19
12
|
on(event: string | symbol, listener: (...args: any[]) => void): Stream.Readable;
|
|
20
13
|
};
|
|
21
14
|
export interface ResultSetOptions<Format extends DataFormat> {
|
|
@@ -30,6 +23,7 @@ export declare class ResultSet<Format extends DataFormat | unknown> implements B
|
|
|
30
23
|
private readonly format;
|
|
31
24
|
readonly query_id: string;
|
|
32
25
|
readonly response_headers: ResponseHeaders;
|
|
26
|
+
private readonly exceptionTag;
|
|
33
27
|
private readonly log_error;
|
|
34
28
|
constructor(_stream: Stream.Readable, format: Format, query_id: string, log_error?: (error: Error) => void, _response_headers?: ResponseHeaders);
|
|
35
29
|
/** See {@link BaseResultSet.text}. */
|
package/dist/result_set.js
CHANGED
|
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.ResultSet = void 0;
|
|
37
37
|
const client_common_1 = require("@clickhouse/client-common");
|
|
38
|
+
const client_common_2 = require("@clickhouse/client-common");
|
|
38
39
|
const buffer_1 = require("buffer");
|
|
39
40
|
const stream_1 = __importStar(require("stream"));
|
|
40
41
|
const utils_1 = require("./utils");
|
|
@@ -63,7 +64,13 @@ class ResultSet {
|
|
|
63
64
|
enumerable: true,
|
|
64
65
|
configurable: true,
|
|
65
66
|
writable: true,
|
|
66
|
-
value:
|
|
67
|
+
value: {}
|
|
68
|
+
});
|
|
69
|
+
Object.defineProperty(this, "exceptionTag", {
|
|
70
|
+
enumerable: true,
|
|
71
|
+
configurable: true,
|
|
72
|
+
writable: true,
|
|
73
|
+
value: undefined
|
|
67
74
|
});
|
|
68
75
|
Object.defineProperty(this, "log_error", {
|
|
69
76
|
enumerable: true,
|
|
@@ -73,8 +80,10 @@ class ResultSet {
|
|
|
73
80
|
});
|
|
74
81
|
// eslint-disable-next-line no-console
|
|
75
82
|
this.log_error = log_error ?? ((err) => console.error(err));
|
|
76
|
-
|
|
77
|
-
|
|
83
|
+
if (_response_headers !== undefined) {
|
|
84
|
+
this.response_headers = Object.freeze(_response_headers);
|
|
85
|
+
this.exceptionTag = _response_headers[client_common_1.EXCEPTION_TAG_HEADER_NAME];
|
|
86
|
+
}
|
|
78
87
|
}
|
|
79
88
|
/** See {@link BaseResultSet.text}. */
|
|
80
89
|
async text() {
|
|
@@ -89,7 +98,7 @@ class ResultSet {
|
|
|
89
98
|
throw Error(streamAlreadyConsumedMessage);
|
|
90
99
|
}
|
|
91
100
|
// JSONEachRow, etc.
|
|
92
|
-
if ((0,
|
|
101
|
+
if ((0, client_common_2.isStreamableJSONFamily)(this.format)) {
|
|
93
102
|
const result = [];
|
|
94
103
|
const stream = this.stream();
|
|
95
104
|
for await (const rows of stream) {
|
|
@@ -100,7 +109,7 @@ class ResultSet {
|
|
|
100
109
|
return result;
|
|
101
110
|
}
|
|
102
111
|
// JSON, JSONObjectEachRow, etc.
|
|
103
|
-
if ((0,
|
|
112
|
+
if ((0, client_common_2.isNotStreamableJSONFamily)(this.format)) {
|
|
104
113
|
const text = await (0, utils_1.getAsText)(this._stream);
|
|
105
114
|
return JSON.parse(text);
|
|
106
115
|
}
|
|
@@ -115,56 +124,46 @@ class ResultSet {
|
|
|
115
124
|
if (this._stream.readableEnded) {
|
|
116
125
|
throw Error(streamAlreadyConsumedMessage);
|
|
117
126
|
}
|
|
118
|
-
(0,
|
|
127
|
+
(0, client_common_2.validateStreamFormat)(this.format);
|
|
119
128
|
let incompleteChunks = [];
|
|
120
129
|
const logError = this.log_error;
|
|
130
|
+
const exceptionTag = this.exceptionTag;
|
|
121
131
|
const toRows = new stream_1.Transform({
|
|
122
132
|
transform(chunk, _encoding, callback) {
|
|
123
133
|
const rows = [];
|
|
134
|
+
let idx = -1;
|
|
124
135
|
let lastIdx = 0;
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
text = buffer_1.Buffer.concat([...incompleteChunks, chunk.subarray(0, idx)], incompleteChunks.reduce((sz, buf) => sz + buf.length, 0) + idx).toString();
|
|
132
|
-
incompleteChunks = [];
|
|
133
|
-
}
|
|
134
|
-
else {
|
|
135
|
-
text = chunk.subarray(0, idx).toString();
|
|
136
|
+
let currentChunkPart;
|
|
137
|
+
do {
|
|
138
|
+
idx = chunk.indexOf(NEWLINE, lastIdx);
|
|
139
|
+
const maybeErr = (0, client_common_1.checkErrorInChunkAtIndex)(chunk, idx, exceptionTag);
|
|
140
|
+
if (maybeErr) {
|
|
141
|
+
return callback(maybeErr);
|
|
136
142
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
},
|
|
142
|
-
});
|
|
143
|
-
lastIdx = idx + 1; // skipping newline character
|
|
144
|
-
// consequent passes on the current chunk with at least one row parsed
|
|
145
|
-
// all previous chunks with incomplete rows were already processed
|
|
146
|
-
do {
|
|
147
|
-
idx = chunk.indexOf(NEWLINE, lastIdx);
|
|
148
|
-
if (idx !== -1) {
|
|
149
|
-
const text = chunk.subarray(lastIdx, idx).toString();
|
|
150
|
-
rows.push({
|
|
151
|
-
text,
|
|
152
|
-
json() {
|
|
153
|
-
return JSON.parse(text);
|
|
154
|
-
},
|
|
155
|
-
});
|
|
143
|
+
if (idx !== -1) {
|
|
144
|
+
if (incompleteChunks.length > 0) {
|
|
145
|
+
currentChunkPart = buffer_1.Buffer.concat([...incompleteChunks, chunk.subarray(lastIdx, idx)], incompleteChunks.reduce((sz, buf) => sz + buf.length, 0) + idx);
|
|
146
|
+
incompleteChunks = [];
|
|
156
147
|
}
|
|
157
148
|
else {
|
|
158
|
-
|
|
159
|
-
incompleteChunks.push(chunk.subarray(lastIdx));
|
|
160
|
-
this.push(rows);
|
|
149
|
+
currentChunkPart = chunk.subarray(lastIdx, idx);
|
|
161
150
|
}
|
|
151
|
+
const text = currentChunkPart.toString();
|
|
152
|
+
rows.push({
|
|
153
|
+
text,
|
|
154
|
+
json() {
|
|
155
|
+
return JSON.parse(text);
|
|
156
|
+
},
|
|
157
|
+
});
|
|
162
158
|
lastIdx = idx + 1; // skipping newline character
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
incompleteChunks.push(chunk.subarray(lastIdx));
|
|
162
|
+
if (rows.length > 0) {
|
|
163
|
+
this.push(rows);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
} while (idx !== -1);
|
|
168
167
|
callback();
|
|
169
168
|
},
|
|
170
169
|
autoDestroy: true,
|
package/dist/result_set.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result_set.js","sourceRoot":"","sources":["../../../packages/client-node/src/result_set.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,6DAIkC;AAClC,mCAA+B;AAE/B,iDAA0C;AAC1C,mCAAmC;AAEnC,MAAM,OAAO,GAAG,IAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"result_set.js","sourceRoot":"","sources":["../../../packages/client-node/src/result_set.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,6DAGkC;AAClC,6DAIkC;AAClC,mCAA+B;AAE/B,iDAA0C;AAC1C,mCAAmC;AAEnC,MAAM,OAAO,GAAG,IAAa,CAAA;AAmC7B,MAAa,SAAS;IAQpB,YACU,OAAwB,EACf,MAAc,EACf,QAAgB,EAChC,SAAkC,EAClC,iBAAmC;QAJnC;;;;mBAAQ,OAAO;WAAiB;QAChC;;;;mBAAiB,MAAM;WAAQ;QAC/B;;;;mBAAgB,QAAQ;WAAQ;QARlB;;;;mBAAoC,EAAE;WAAA;QAErC;;;;mBAAmC,SAAS;WAAA;QAC5C;;;;;WAAiC;QAShD,sCAAsC;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,GAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QAElE,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;YACxD,IAAI,CAAC,YAAY,GAAG,iBAAiB,CAAC,yCAAyB,CAElD,CAAA;QACf,CAAC;IACH,CAAC;IAED,sCAAsC;IACtC,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,CAAC,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IACnD,CAAC;IAED,sCAAsC;IACtC,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,CAAC;QACD,oBAAoB;QACpB,IAAI,IAAA,sCAAsB,EAAC,IAAI,CAAC,MAAoB,CAAC,EAAE,CAAC;YACtD,MAAM,MAAM,GAAQ,EAAE,CAAA;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAK,CAAA;YAC/B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;gBAChC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAO,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC;YACD,OAAO,MAAa,CAAA;QACtB,CAAC;QACD,gCAAgC;QAChC,IAAI,IAAA,yCAAyB,EAAC,IAAI,CAAC,MAAoB,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,GAAG,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC;QACD,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,MAAM,UAAU,CAAC,CAAA;IACzD,CAAC;IAED,wCAAwC;IACxC,MAAM;QACJ,0EAA0E;QAC1E,iDAAiD;QACjD,+CAA+C;QAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,CAAC;QAED,IAAA,oCAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjC,IAAI,gBAAgB,GAAa,EAAE,CAAA;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAA;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;QACtC,MAAM,MAAM,GAAG,IAAI,kBAAS,CAAC;YAC3B,SAAS,CACP,KAAa,EACb,SAAyB,EACzB,QAA2B;gBAE3B,MAAM,IAAI,GAAU,EAAE,CAAA;gBAEtB,IAAI,GAAG,GAAG,CAAC,CAAC,CAAA;gBACZ,IAAI,OAAO,GAAG,CAAC,CAAA;gBACf,IAAI,gBAAwB,CAAA;gBAE5B,GAAG,CAAC;oBACF,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBAErC,MAAM,QAAQ,GAAG,IAAA,wCAAwB,EAAC,KAAK,EAAE,GAAG,EAAE,YAAY,CAAC,CAAA;oBACnE,IAAI,QAAQ,EAAE,CAAC;wBACb,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAA;oBAC3B,CAAC;oBAED,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;wBACf,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAChC,gBAAgB,GAAG,eAAM,CAAC,MAAM,CAC9B,CAAC,GAAG,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EACnD,gBAAgB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,GAAG,CAC/D,CAAA;4BACD,gBAAgB,GAAG,EAAE,CAAA;wBACvB,CAAC;6BAAM,CAAC;4BACN,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;wBACjD,CAAC;wBAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAA;wBACxC,IAAI,CAAC,IAAI,CAAC;4BACR,IAAI;4BACJ,IAAI;gCACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;4BACzB,CAAC;yBACF,CAAC,CAAA;wBACF,OAAO,GAAG,GAAG,GAAG,CAAC,CAAA,CAAC,6BAA6B;oBACjD,CAAC;yBAAM,CAAC;wBACN,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;wBAC9C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACjB,CAAC;oBACH,CAAC;gBACH,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,EAAC;gBACpB,QAAQ,EAAE,CAAA;YACZ,CAAC;YACD,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,gBAAM,CAAC,QAAQ,CAC9B,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,SAAS,UAAU,CAAC,GAAG;YACrB,IACE,GAAG;gBACH,GAAG,CAAC,IAAI,KAAK,YAAY;gBACzB,GAAG,CAAC,OAAO,KAAK,sBAAsB,EACtC,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,CAAA;YACf,CAAC;QACH,CAAC,CACF,CAAA;QACD,OAAO,QAAe,CAAA;IACxB,CAAC;IAED,uCAAuC;IACvC,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,CAAC,QAAQ,CAA4B,EACzC,MAAM,EACN,MAAM,EACN,QAAQ,EACR,SAAS,EACT,gBAAgB,GACS;QACzB,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;CACF;AA3JD,8BA2JC;AAED,MAAM,4BAA4B,GAAG,kCAAkC,CAAA;AACvE,MAAM,sBAAsB,GAAG,2BAA2B,CAAA"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.Runtime = void 0;
|
|
40
|
+
const os = __importStar(require("node:os"));
|
|
41
|
+
const version_1 = __importDefault(require("../version"));
|
|
42
|
+
/** Indirect export of package version and node version for easier mocking since Node.js 22.18 */
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-extraneous-class
|
|
44
|
+
class Runtime {
|
|
45
|
+
}
|
|
46
|
+
exports.Runtime = Runtime;
|
|
47
|
+
Object.defineProperty(Runtime, "package", {
|
|
48
|
+
enumerable: true,
|
|
49
|
+
configurable: true,
|
|
50
|
+
writable: true,
|
|
51
|
+
value: version_1.default
|
|
52
|
+
});
|
|
53
|
+
Object.defineProperty(Runtime, "node", {
|
|
54
|
+
enumerable: true,
|
|
55
|
+
configurable: true,
|
|
56
|
+
writable: true,
|
|
57
|
+
value: process.version
|
|
58
|
+
});
|
|
59
|
+
Object.defineProperty(Runtime, "os", {
|
|
60
|
+
enumerable: true,
|
|
61
|
+
configurable: true,
|
|
62
|
+
writable: true,
|
|
63
|
+
value: os.platform()
|
|
64
|
+
});
|
|
65
|
+
//# sourceMappingURL=runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../packages/client-node/src/utils/runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6B;AAC7B,yDAAuC;AAEvC,iGAAiG;AACjG,kEAAkE;AAClE,MAAa,OAAO;;AAApB,0BAIC;AAHQ;;;;WAAU,iBAAc;GAAA;AACxB;;;;WAAO,OAAO,CAAC,OAAO;GAAA;AACtB;;;;WAAK,EAAE,CAAC,QAAQ,EAAE;GAAA"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Generate a user agent string like
|
|
3
|
+
* ```
|
|
3
4
|
* clickhouse-js/0.0.11 (lv:nodejs/19.0.4; os:linux)
|
|
5
|
+
* ```
|
|
4
6
|
* or
|
|
7
|
+
* ```
|
|
5
8
|
* MyApplicationName clickhouse-js/0.0.11 (lv:nodejs/19.0.4; os:linux)
|
|
9
|
+
* ```
|
|
6
10
|
*/
|
|
7
11
|
export declare function getUserAgent(application_id?: string): string;
|
package/dist/utils/user_agent.js
CHANGED
|
@@ -1,52 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
3
|
exports.getUserAgent = getUserAgent;
|
|
40
|
-
const
|
|
41
|
-
const version_1 = __importDefault(require("../version"));
|
|
4
|
+
const runtime_1 = require("./runtime");
|
|
42
5
|
/**
|
|
43
6
|
* Generate a user agent string like
|
|
7
|
+
* ```
|
|
44
8
|
* clickhouse-js/0.0.11 (lv:nodejs/19.0.4; os:linux)
|
|
9
|
+
* ```
|
|
45
10
|
* or
|
|
11
|
+
* ```
|
|
46
12
|
* MyApplicationName clickhouse-js/0.0.11 (lv:nodejs/19.0.4; os:linux)
|
|
13
|
+
* ```
|
|
47
14
|
*/
|
|
48
15
|
function getUserAgent(application_id) {
|
|
49
|
-
const defaultUserAgent = `clickhouse-js/${
|
|
16
|
+
const defaultUserAgent = `clickhouse-js/${runtime_1.Runtime.package} (lv:nodejs/${runtime_1.Runtime.node}; os:${runtime_1.Runtime.os})`;
|
|
50
17
|
return application_id
|
|
51
18
|
? `${application_id} ${defaultUserAgent}`
|
|
52
19
|
: defaultUserAgent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user_agent.js","sourceRoot":"","sources":["../../../../packages/client-node/src/utils/user_agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user_agent.js","sourceRoot":"","sources":["../../../../packages/client-node/src/utils/user_agent.ts"],"names":[],"mappings":";;AAYA,oCAOC;AAnBD,uCAAmC;AAEnC;;;;;;;;;GASG;AACH,SAAgB,YAAY,CAAC,cAAuB;IAClD,MAAM,gBAAgB,GAAG,iBAAiB,iBAAO,CAAC,OAAO,eACvD,iBAAO,CAAC,IACV,QAAQ,iBAAO,CAAC,EAAE,GAAG,CAAA;IACrB,OAAO,cAAc;QACnB,CAAC,CAAC,GAAG,cAAc,IAAI,gBAAgB,EAAE;QACzC,CAAC,CAAC,gBAAgB,CAAA;AACtB,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "1.
|
|
1
|
+
declare const _default: "1.13.0";
|
|
2
2
|
export default _default;
|
package/dist/version.js
CHANGED
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.
|
|
5
|
+
"version": "1.13.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.
|
|
26
|
+
"@clickhouse/client-common": "1.13.0"
|
|
27
27
|
}
|
|
28
28
|
}
|