@clickhouse/client 0.2.5 → 0.2.6
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.js
CHANGED
|
@@ -6,9 +6,8 @@ const connection_1 = require("./connection");
|
|
|
6
6
|
const result_set_1 = require("./result_set");
|
|
7
7
|
const utils_1 = require("./utils");
|
|
8
8
|
function createClient(config) {
|
|
9
|
-
var _a, _b, _c, _d, _e, _f;
|
|
10
9
|
let tls = undefined;
|
|
11
|
-
if (config
|
|
10
|
+
if (config?.tls) {
|
|
12
11
|
if ('cert' in config.tls && 'key' in config.tls) {
|
|
13
12
|
tls = {
|
|
14
13
|
type: 'Mutual',
|
|
@@ -23,9 +22,9 @@ function createClient(config) {
|
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
24
|
const keep_alive = {
|
|
26
|
-
enabled:
|
|
27
|
-
socket_ttl:
|
|
28
|
-
retry_on_expired_socket:
|
|
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,
|
|
29
28
|
};
|
|
30
29
|
return new client_common_1.ClickHouseClient({
|
|
31
30
|
impl: {
|
package/dist/client.js.map
CHANGED
|
@@ -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
|
|
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"}
|
|
@@ -9,26 +9,24 @@ const https_1 = __importDefault(require("https"));
|
|
|
9
9
|
const node_base_connection_1 = require("./node_base_connection");
|
|
10
10
|
class NodeHttpsConnection extends node_base_connection_1.NodeBaseConnection {
|
|
11
11
|
constructor(params) {
|
|
12
|
-
var _a, _b, _c;
|
|
13
12
|
const agent = new https_1.default.Agent({
|
|
14
13
|
keepAlive: params.keep_alive.enabled,
|
|
15
14
|
maxSockets: params.max_open_connections,
|
|
16
|
-
ca:
|
|
17
|
-
key:
|
|
18
|
-
cert:
|
|
15
|
+
ca: params.tls?.ca_cert,
|
|
16
|
+
key: params.tls?.type === 'Mutual' ? params.tls.key : undefined,
|
|
17
|
+
cert: params.tls?.type === 'Mutual' ? params.tls.cert : undefined,
|
|
19
18
|
});
|
|
20
19
|
super(params, agent);
|
|
21
20
|
}
|
|
22
21
|
buildDefaultHeaders(username, password) {
|
|
23
|
-
|
|
24
|
-
if (((_a = this.params.tls) === null || _a === void 0 ? void 0 : _a.type) === 'Mutual') {
|
|
22
|
+
if (this.params.tls?.type === 'Mutual') {
|
|
25
23
|
return {
|
|
26
24
|
'X-ClickHouse-User': username,
|
|
27
25
|
'X-ClickHouse-Key': password,
|
|
28
26
|
'X-ClickHouse-SSL-Certificate-Auth': 'on',
|
|
29
27
|
};
|
|
30
28
|
}
|
|
31
|
-
if (
|
|
29
|
+
if (this.params.tls?.type === 'Basic') {
|
|
32
30
|
return {
|
|
33
31
|
'X-ClickHouse-User': username,
|
|
34
32
|
'X-ClickHouse-Key': password,
|
|
@@ -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
|
|
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;QAEhB,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,CAAC,CAAA;IACtD,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;AA/CD,kDA+CC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "0.2.
|
|
1
|
+
declare const _default: "0.2.6";
|
|
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": "0.2.
|
|
5
|
+
"version": "0.2.6",
|
|
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.
|
|
26
|
+
"@clickhouse/client-common": "0.2.6"
|
|
27
27
|
}
|
|
28
28
|
}
|