@clickhouse/client 1.12.0 → 1.12.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/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 +29 -25
- package/dist/connection/create_connection.js.map +1 -1
- package/dist/utils/runtime.d.ts +6 -0
- package/dist/utils/runtime.js +64 -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,41 @@
|
|
|
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
|
-
capture_enhanced_stack_trace,
|
|
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
|
+
class NodeConnectionFactory {
|
|
9
|
+
static create({ connection_params, tls, keep_alive, http_agent, set_basic_auth_header, capture_enhanced_stack_trace, }) {
|
|
10
|
+
if (http_agent !== undefined) {
|
|
11
|
+
return new node_custom_agent_connection_1.NodeCustomAgentConnection({
|
|
27
12
|
...connection_params,
|
|
28
13
|
set_basic_auth_header,
|
|
29
14
|
capture_enhanced_stack_trace,
|
|
30
|
-
keep_alive,
|
|
31
|
-
|
|
15
|
+
keep_alive, // only used to enforce proper KeepAlive headers
|
|
16
|
+
http_agent,
|
|
32
17
|
});
|
|
33
|
-
|
|
34
|
-
|
|
18
|
+
}
|
|
19
|
+
switch (connection_params.url.protocol) {
|
|
20
|
+
case 'http:':
|
|
21
|
+
return new node_http_connection_1.NodeHttpConnection({
|
|
22
|
+
...connection_params,
|
|
23
|
+
set_basic_auth_header,
|
|
24
|
+
capture_enhanced_stack_trace,
|
|
25
|
+
keep_alive,
|
|
26
|
+
});
|
|
27
|
+
case 'https:':
|
|
28
|
+
return new node_https_connection_1.NodeHttpsConnection({
|
|
29
|
+
...connection_params,
|
|
30
|
+
set_basic_auth_header,
|
|
31
|
+
capture_enhanced_stack_trace,
|
|
32
|
+
keep_alive,
|
|
33
|
+
tls,
|
|
34
|
+
});
|
|
35
|
+
default:
|
|
36
|
+
throw new Error('Only HTTP and HTTPS protocols are supported');
|
|
37
|
+
}
|
|
35
38
|
}
|
|
36
39
|
}
|
|
40
|
+
exports.NodeConnectionFactory = NodeConnectionFactory;
|
|
37
41
|
//# 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,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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
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
|
+
class Runtime {
|
|
44
|
+
}
|
|
45
|
+
exports.Runtime = Runtime;
|
|
46
|
+
Object.defineProperty(Runtime, "package", {
|
|
47
|
+
enumerable: true,
|
|
48
|
+
configurable: true,
|
|
49
|
+
writable: true,
|
|
50
|
+
value: version_1.default
|
|
51
|
+
});
|
|
52
|
+
Object.defineProperty(Runtime, "node", {
|
|
53
|
+
enumerable: true,
|
|
54
|
+
configurable: true,
|
|
55
|
+
writable: true,
|
|
56
|
+
value: process.version
|
|
57
|
+
});
|
|
58
|
+
Object.defineProperty(Runtime, "os", {
|
|
59
|
+
enumerable: true,
|
|
60
|
+
configurable: true,
|
|
61
|
+
writable: true,
|
|
62
|
+
value: os.platform()
|
|
63
|
+
});
|
|
64
|
+
//# 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,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.12.
|
|
1
|
+
declare const _default: "1.12.1";
|
|
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.12.
|
|
5
|
+
"version": "1.12.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": "1.12.
|
|
26
|
+
"@clickhouse/client-common": "1.12.1"
|
|
27
27
|
}
|
|
28
28
|
}
|