@clickhouse/client 0.1.1 → 0.2.0-beta1

package/README.md

@@ -1,22 +1,26 @@
 <p align="center">
 <img src=".static/logo.png" width="200px" align="center">
-<h1 align="center">ClickHouse Node.JS client</h1>
+<h1 align="center">ClickHouse JS client</h1>
 </p>
 <br/>
 <p align="center">
 <a href="https://github.com/ClickHouse/clickhouse-js/actions/workflows/tests.yml">
 <img src="https://github.com/ClickHouse/clickhouse-js/actions/workflows/tests.yml/badge.svg?branch=main">
 </a>
-<a href="http://htmlpreview.github.io/?https://github.com/ClickHouse/clickhouse-js/blob/main/coverage/lcov-report/index.html">
-<img src="./coverage/badge.svg">
-</a>
 </p>
 
 ## About
 
-Official Node.js client for [ClickHouse](https://clickhouse.com/), written purely in TypeScript, thoroughly tested with actual ClickHouse versions.
+Official JS client for [ClickHouse](https://clickhouse.com/), written purely in TypeScript,
+thoroughly tested with actual ClickHouse versions.
+
+The repository consists of three packages:
 
-It is focused on data streaming for both inserts and selects using standard [Node.js Streaming API](https://nodejs.org/docs/latest-v14.x/api/stream.html).
+- `@clickhouse/client` - Node.js client, built on top of [HTTP](https://nodejs.org/api/http.html)
+  and [Stream](https://nodejs.org/api/stream.html) APIs; supports streaming for both selects and inserts.
+- `@clickhouse/client-browser` - browser client, built on top of [Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API)
+  and [Web Streams](https://developer.mozilla.org/en-US/docs/Web/API/Streams_API) APIs; supports streaming for selects.
+- `@clickhouse/common` - shared common types and the base framework for building a custom client implementation.
 
 ## Documentation
 

package/dist/client.d.ts

@@ -1,69 +1,30 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import Stream from 'stream';
-import type { ExecResult, InsertResult } from './connection';
-import type { Logger } from './logger';
-import { type DataFormat } from './data_formatter';
-import { ResultSet } from './result';
-import type { ClickHouseSettings } from './settings';
-import type { InputJSON, InputJSONObjectEachRow } from './clickhouse_types';
-export interface ClickHouseClientConfigOptions {
-    /** A ClickHouse instance URL.
-     * <br/> Default value: `http://localhost:8123`. */
-    host?: string;
-    /** The request timeout in milliseconds.
-     * <br/> Default value: `30_000`. */
-    request_timeout?: number;
-    /** Maximum number of sockets to allow per host.
-     * <br/> Default value: `Infinity`. */
-    max_open_connections?: number;
-    compression?: {
-        /** `response: true` instructs ClickHouse server to respond with
-         * compressed response body. <br/> Default: true. */
-        response?: boolean;
-        /** `request: true` enabled compression on the client request body.
-         * <br/> Default: false. */
-        request?: boolean;
-    };
-    /** The name of the user on whose behalf requests are made.
-     * <br/> Default: 'default'. */
-    username?: string;
-    /** The user password. <br/> Default: ''. */
-    password?: string;
-    /** The name of the application using the nodejs client.
-     * <br/> Default: empty. */
-    application?: string;
-    /** Database name to use. <br/> Default value: `default`. */
-    database?: string;
-    /** ClickHouse settings to apply to all requests. <br/> Default value: {} */
-    clickhouse_settings?: ClickHouseSettings;
-    log?: {
-        /** A class to instantiate a custom logger implementation.
-         * <br/> Default: {@link DefaultLogger} */
-        LoggerClass?: new () => Logger;
-    };
+import type { BaseClickHouseClientConfigOptions, Connection } from '@clickhouse/client-common';
+import { ClickHouseClient } from '@clickhouse/client-common';
+import type Stream from 'stream';
+import type { NodeConnectionParams } from './connection';
+export type NodeClickHouseClientConfigOptions = BaseClickHouseClientConfigOptions<Stream.Readable> & {
     tls?: BasicTLSOptions | MutualTLSOptions;
-    session_id?: string;
     /** HTTP Keep-Alive related settings */
     keep_alive?: {
-        /** Enable or disable HTTP Keep-Alive mechanism. <br/> Default: true */
+        /** Enable or disable HTTP Keep-Alive mechanism. Default: true */
         enabled?: boolean;
         /** How long to keep a particular open socket alive
          * on the client side (in milliseconds).
          * Should be less than the server setting
-         * (see `keep_alive_timeout` in server's `config.xml`). <br/>
+         * (see `keep_alive_timeout` in server's `config.xml`).
          * Currently, has no effect if {@link retry_on_expired_socket}
-         * is unset or false. <br/> Default value: 2500
+         * is unset or false. Default value: 2500
          * (based on the default ClickHouse server setting, which is 3000) */
         socket_ttl?: number;
         /** If the client detects a potentially expired socket based on the
          * {@link socket_ttl}, this socket will be immediately destroyed
          * before sending the request, and this request will be retried
-         * with a new socket up to 3 times.
-         * <br/> * Default: false (no retries) */
+         * with a new socket up to 3 times. Default: false (no retries) */
         retry_on_expired_socket?: boolean;
     };
-}
+};
 interface BasicTLSOptions {
     ca_cert: Buffer;
 }
@@ -72,96 +33,6 @@ interface MutualTLSOptions {
     cert: Buffer;
     key: Buffer;
 }
-export interface BaseParams {
-    /** ClickHouse settings that can be applied on query level. */
-    clickhouse_settings?: ClickHouseSettings;
-    /** Parameters for query binding. https://clickhouse.com/docs/en/interfaces/http/#cli-queries-with-parameters */
-    query_params?: Record<string, unknown>;
-    /** AbortSignal instance to cancel a request in progress. */
-    abort_signal?: AbortSignal;
-    /** A specific `query_id` that will be sent with this request.
-     * If it is not set, a random identifier will be generated automatically by the client. */
-    query_id?: string;
-}
-export interface QueryParams extends BaseParams {
-    /** Statement to execute. */
-    query: string;
-    /** Format of the resulting dataset. */
-    format?: DataFormat;
-}
-export interface ExecParams extends BaseParams {
-    /** Statement to execute. */
-    query: string;
-}
-export type CommandParams = ExecParams;
-export interface CommandResult {
-    query_id: string;
-}
-type InsertValues<T> = ReadonlyArray<T> | Stream.Readable | InputJSON<T> | InputJSONObjectEachRow<T>;
-export interface InsertParams<T = unknown> extends BaseParams {
-    /** Name of a table to insert into. */
-    table: string;
-    /** A dataset to insert. */
-    values: InsertValues<T>;
-    /** Format of the dataset to insert. */
-    format?: DataFormat;
-}
-export declare class ClickHouseClient {
-    private readonly config;
-    private readonly connection;
-    private readonly logger;
-    constructor(config?: ClickHouseClientConfigOptions);
-    private getBaseParams;
-    /**
-     * Used for most statements that can have a response, such as SELECT.
-     * FORMAT clause should be specified separately via {@link QueryParams.format} (default is JSON)
-     * Consider using {@link ClickHouseClient.insert} for data insertion,
-     * or {@link ClickHouseClient.command} for DDLs.
-     */
-    query(params: QueryParams): Promise<ResultSet>;
-    /**
-     * It should be used for statements that do not have any output,
-     * when the format clause is not applicable, or when you are not interested in the response at all.
-     * Response stream is destroyed immediately as we do not expect useful information there.
-     * Examples of such statements are DDLs or custom inserts.
-     * If you are interested in the response data, consider using {@link ClickHouseClient.exec}
-     */
-    command(params: CommandParams): Promise<CommandResult>;
-    /**
-     * Similar to {@link ClickHouseClient.command}, but for the cases where the output is expected,
-     * but format clause is not applicable. The caller of this method is expected to consume the stream,
-     * otherwise, the request will eventually be timed out.
-     */
-    exec(params: ExecParams): Promise<ExecResult>;
-    /**
-     * The primary method for data insertion. It is recommended to avoid arrays in case of large inserts
-     * to reduce application memory consumption and consider streaming for most of such use cases.
-     * As the insert operation does not provide any output, the response stream is immediately destroyed.
-     * In case of a custom insert operation, such as, for example, INSERT FROM SELECT,
-     * consider using {@link ClickHouseClient.command}, passing the entire raw query there (including FORMAT clause).
-     */
-    insert<T>(params: InsertParams<T>): Promise<InsertResult>;
-    /**
-     * Health-check request. Can throw an error if the connection is refused.
-     */
-    ping(): Promise<boolean>;
-    /**
-     * Shuts down the underlying connection.
-     * This method should ideally be called only once per application lifecycle,
-     * for example, during the graceful shutdown phase.
-     */
-    close(): Promise<void>;
-}
-export declare function validateInsertValues<T>(values: InsertValues<T>, format: DataFormat): void;
-/**
- * A function encodes an array or a stream of JSON objects to a format compatible with ClickHouse.
- * If values are provided as an array of JSON objects, the function encodes it in place.
- * If values are provided as a stream of JSON objects, the function sets up the encoding of each chunk.
- * If values are provided as a raw non-object stream, the function does nothing.
- *
- * @param values a set of values to send to ClickHouse.
- * @param format a format to encode value to.
- */
-export declare function encodeValues<T>(values: InsertValues<T>, format: DataFormat): string | Stream.Readable;
-export declare function createClient(config?: ClickHouseClientConfigOptions): ClickHouseClient;
+export declare function createClient(config?: NodeClickHouseClientConfigOptions): ClickHouseClient<Stream.Readable>;
+export declare function createConnection(params: NodeConnectionParams): Connection<Stream.Readable>;
 export {};

package/dist/client.js

@@ -1,33 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClient = exports.encodeValues = exports.validateInsertValues = exports.ClickHouseClient = void 0;
-const stream_1 = __importDefault(require("stream"));
+exports.createConnection = exports.createClient = void 0;
+const client_common_1 = require("@clickhouse/client-common");
 const connection_1 = require("./connection");
-const logger_1 = require("./logger");
+const result_set_1 = require("./result_set");
 const utils_1 = require("./utils");
-const data_formatter_1 = require("./data_formatter");
-const result_1 = require("./result");
-function validateConfig({ url }) {
-    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
-        throw new Error(`Only http(s) protocol is supported, but given: [${url.protocol}]`);
-    }
-    // TODO add SSL validation
-}
-function createUrl(host) {
-    try {
-        return new URL(host);
-    }
-    catch (err) {
-        throw new Error('Configuration parameter "host" contains malformed url.');
-    }
-}
-function normalizeConfig(config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+function createClient(config) {
+    var _a, _b, _c, _d, _e, _f;
     let tls = undefined;
-    if (config.tls) {
+    if (config === null || config === void 0 ? void 0 : config.tls) {
         if ('cert' in config.tls && 'key' in config.tls) {
             tls = {
                 type: 'Mutual',
@@ -41,214 +22,43 @@ function normalizeConfig(config) {
             };
         }
     }
-    return {
-        application_id: config.application,
-        url: createUrl((_a = config.host) !== null && _a !== void 0 ? _a : 'http://localhost:8123'),
-        request_timeout: (_b = config.request_timeout) !== null && _b !== void 0 ? _b : 300000,
-        max_open_connections: (_c = config.max_open_connections) !== null && _c !== void 0 ? _c : Infinity,
-        tls,
-        compression: {
-            decompress_response: (_e = (_d = config.compression) === null || _d === void 0 ? void 0 : _d.response) !== null && _e !== void 0 ? _e : true,
-            compress_request: (_g = (_f = config.compression) === null || _f === void 0 ? void 0 : _f.request) !== null && _g !== void 0 ? _g : false,
-        },
-        username: (_h = config.username) !== null && _h !== void 0 ? _h : 'default',
-        password: (_j = config.password) !== null && _j !== void 0 ? _j : '',
-        database: (_k = config.database) !== null && _k !== void 0 ? _k : 'default',
-        clickhouse_settings: (_l = config.clickhouse_settings) !== null && _l !== void 0 ? _l : {},
-        log: {
-            LoggerClass: (_o = (_m = config.log) === null || _m === void 0 ? void 0 : _m.LoggerClass) !== null && _o !== void 0 ? _o : logger_1.DefaultLogger,
-        },
-        session_id: config.session_id,
-        keep_alive: {
-            enabled: (_q = (_p = config.keep_alive) === null || _p === void 0 ? void 0 : _p.enabled) !== null && _q !== void 0 ? _q : true,
-            socket_ttl: (_s = (_r = config.keep_alive) === null || _r === void 0 ? void 0 : _r.socket_ttl) !== null && _s !== void 0 ? _s : 2500,
-            retry_on_expired_socket: (_u = (_t = config.keep_alive) === null || _t === void 0 ? void 0 : _t.retry_on_expired_socket) !== null && _u !== void 0 ? _u : false,
-        },
+    const keep_alive = {
+        enabled: (_b = (_a = config === null || config === void 0 ? void 0 : config.keep_alive) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : true,
+        socket_ttl: (_d = (_c = config === null || config === void 0 ? void 0 : config.keep_alive) === null || _c === void 0 ? void 0 : _c.socket_ttl) !== null && _d !== void 0 ? _d : 2500,
+        retry_on_expired_socket: (_f = (_e = config === null || config === void 0 ? void 0 : config.keep_alive) === null || _e === void 0 ? void 0 : _e.retry_on_expired_socket) !== null && _f !== void 0 ? _f : false,
     };
-}
-class ClickHouseClient {
-    constructor(config = {}) {
-        Object.defineProperty(this, "config", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "connection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "logger", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.config = normalizeConfig(config);
-        validateConfig(this.config);
-        this.logger = new logger_1.LogWriter(new this.config.log.LoggerClass());
-        this.connection = (0, connection_1.createConnection)(this.config, this.logger);
-    }
-    getBaseParams(params) {
-        return {
-            clickhouse_settings: {
-                ...this.config.clickhouse_settings,
-                ...params.clickhouse_settings,
+    return new client_common_1.ClickHouseClient({
+        impl: {
+            make_connection: (params) => {
+                switch (params.url.protocol) {
+                    case 'http:':
+                        return new connection_1.NodeHttpConnection({ ...params, keep_alive });
+                    case 'https:':
+                        return new connection_1.NodeHttpsConnection({ ...params, tls, keep_alive });
+                    default:
+                        throw new Error('Only HTTP(s) adapters are supported');
+                }
             },
-            query_params: params.query_params,
-            abort_signal: params.abort_signal,
-            session_id: this.config.session_id,
-            query_id: params.query_id,
-        };
-    }
-    /**
-     * Used for most statements that can have a response, such as SELECT.
-     * FORMAT clause should be specified separately via {@link QueryParams.format} (default is JSON)
-     * Consider using {@link ClickHouseClient.insert} for data insertion,
-     * or {@link ClickHouseClient.command} for DDLs.
-     */
-    async query(params) {
-        var _a;
-        const format = (_a = params.format) !== null && _a !== void 0 ? _a : 'JSON';
-        const query = formatQuery(params.query, format);
-        const { stream, query_id } = await this.connection.query({
-            query,
-            ...this.getBaseParams(params),
-        });
-        return new result_1.ResultSet(stream, format, query_id);
-    }
-    /**
-     * It should be used for statements that do not have any output,
-     * when the format clause is not applicable, or when you are not interested in the response at all.
-     * Response stream is destroyed immediately as we do not expect useful information there.
-     * Examples of such statements are DDLs or custom inserts.
-     * If you are interested in the response data, consider using {@link ClickHouseClient.exec}
-     */
-    async command(params) {
-        const { stream, query_id } = await this.exec(params);
-        stream.destroy();
-        return { query_id };
-    }
-    /**
-     * Similar to {@link ClickHouseClient.command}, but for the cases where the output is expected,
-     * but format clause is not applicable. The caller of this method is expected to consume the stream,
-     * otherwise, the request will eventually be timed out.
-     */
-    async exec(params) {
-        const query = removeTrailingSemi(params.query.trim());
-        return await this.connection.exec({
-            query,
-            ...this.getBaseParams(params),
-        });
-    }
-    /**
-     * The primary method for data insertion. It is recommended to avoid arrays in case of large inserts
-     * to reduce application memory consumption and consider streaming for most of such use cases.
-     * As the insert operation does not provide any output, the response stream is immediately destroyed.
-     * In case of a custom insert operation, such as, for example, INSERT FROM SELECT,
-     * consider using {@link ClickHouseClient.command}, passing the entire raw query there (including FORMAT clause).
-     */
-    async insert(params) {
-        const format = params.format || 'JSONCompactEachRow';
-        validateInsertValues(params.values, format);
-        const query = `INSERT INTO ${params.table.trim()} FORMAT ${format}`;
-        return await this.connection.insert({
-            query,
-            values: encodeValues(params.values, format),
-            ...this.getBaseParams(params),
-        });
-    }
-    /**
-     * Health-check request. Can throw an error if the connection is refused.
-     */
-    async ping() {
-        return await this.connection.ping();
-    }
-    /**
-     * Shuts down the underlying connection.
-     * This method should ideally be called only once per application lifecycle,
-     * for example, during the graceful shutdown phase.
-     */
-    async close() {
-        return await this.connection.close();
-    }
-}
-exports.ClickHouseClient = ClickHouseClient;
-function formatQuery(query, format) {
-    query = query.trim();
-    query = removeTrailingSemi(query);
-    return query + ' \nFORMAT ' + format;
-}
-function removeTrailingSemi(query) {
-    let lastNonSemiIdx = query.length;
-    for (let i = lastNonSemiIdx; i > 0; i--) {
-        if (query[i - 1] !== ';') {
-            lastNonSemiIdx = i;
-            break;
-        }
-    }
-    if (lastNonSemiIdx !== query.length) {
-        return query.slice(0, lastNonSemiIdx);
-    }
-    return query;
-}
-function validateInsertValues(values, format) {
-    if (!Array.isArray(values) &&
-        !(0, utils_1.isStream)(values) &&
-        typeof values !== 'object') {
-        throw new Error('Insert expected "values" to be an array, a stream of values or a JSON object, ' +
-            `got: ${typeof values}`);
-    }
-    if ((0, utils_1.isStream)(values)) {
-        if ((0, data_formatter_1.isSupportedRawFormat)(format)) {
-            if (values.readableObjectMode) {
-                throw new Error(`Insert for ${format} expected Readable Stream with disabled object mode.`);
-            }
-        }
-        else if (!values.readableObjectMode) {
-            throw new Error(`Insert for ${format} expected Readable Stream with enabled object mode.`);
-        }
-    }
-}
-exports.validateInsertValues = validateInsertValues;
-/**
- * A function encodes an array or a stream of JSON objects to a format compatible with ClickHouse.
- * If values are provided as an array of JSON objects, the function encodes it in place.
- * If values are provided as a stream of JSON objects, the function sets up the encoding of each chunk.
- * If values are provided as a raw non-object stream, the function does nothing.
- *
- * @param values a set of values to send to ClickHouse.
- * @param format a format to encode value to.
- */
-function encodeValues(values, format) {
-    if ((0, utils_1.isStream)(values)) {
-        // TSV/CSV/CustomSeparated formats don't require additional serialization
-        if (!values.readableObjectMode) {
-            return values;
-        }
-        // JSON* formats streams
-        return stream_1.default.pipeline(values, (0, utils_1.mapStream)((value) => (0, data_formatter_1.encodeJSON)(value, format)), pipelineCb);
-    }
-    // JSON* arrays
-    if (Array.isArray(values)) {
-        return values.map((value) => (0, data_formatter_1.encodeJSON)(value, format)).join('');
-    }
-    // JSON & JSONObjectEachRow format input
-    if (typeof values === 'object') {
-        return (0, data_formatter_1.encodeJSON)(values, format);
-    }
-    throw new Error(`Cannot encode values of type ${typeof values} with ${format} format`);
-}
-exports.encodeValues = encodeValues;
-function createClient(config) {
-    return new ClickHouseClient(config);
+            make_result_set: (stream, format, session_id) => new result_set_1.ResultSet(stream, format, session_id),
+            values_encoder: new utils_1.NodeValuesEncoder(),
+            close_stream: async (stream) => {
+                stream.destroy();
+            },
+        },
+        ...(config || {}),
+    });
 }
 exports.createClient = createClient;
-function pipelineCb(err) {
-    if (err) {
-        console.error(err);
+function createConnection(params) {
+    // TODO throw ClickHouseClient error
+    switch (params.url.protocol) {
+        case 'http:':
+            return new connection_1.NodeHttpConnection(params);
+        case 'https:':
+            return new connection_1.NodeHttpsConnection(params);
+        default:
+            throw new Error('Only HTTP(s) adapters are supported');
     }
 }
+exports.createConnection = createConnection;
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"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,aAAN,MAAM,uBAAN,MAAM,CAAE,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,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,OAAO,mCAAI,IAAI;QAC5C,UAAU,EAAE,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,UAAU,mCAAI,IAAI;QAClD,uBAAuB,EACrB,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,uBAAuB,mCAAI,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"}

package/dist/connection/index.d.ts

@@ -1 +1,3 @@
-export * from './connection';
+export * from './node_base_connection';
+export * from './node_http_connection';
+export * from './node_https_connection';

package/dist/connection/index.js

@@ -14,5 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./connection"), exports);
+__exportStar(require("./node_base_connection"), exports);
+__exportStar(require("./node_http_connection"), exports);
+__exportStar(require("./node_https_connection"), exports);
 //# sourceMappingURL=index.js.map

package/dist/connection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/client-node/src/connection/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAsC;AACtC,yDAAsC;AACtC,0DAAuC"}

package/dist/connection/node_base_connection.d.ts

@@ -0,0 +1,50 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import type { ConnBaseQueryParams, Connection, ConnectionParams, ConnExecResult, ConnInsertParams, ConnInsertResult, ConnQueryResult } from '@clickhouse/client-common';
+import type Http from 'http';
+import Stream from 'stream';
+export type NodeConnectionParams = ConnectionParams & {
+    tls?: TLSParams;
+    keep_alive: {
+        enabled: boolean;
+        socket_ttl: number;
+        retry_on_expired_socket: boolean;
+    };
+};
+export type TLSParams = {
+    ca_cert: Buffer;
+    type: 'Basic';
+} | {
+    ca_cert: Buffer;
+    cert: Buffer;
+    key: Buffer;
+    type: 'Mutual';
+};
+export interface RequestParams {
+    method: 'GET' | 'POST';
+    url: URL;
+    body?: string | Stream.Readable;
+    abort_signal?: AbortSignal;
+    decompress_response?: boolean;
+    compress_request?: boolean;
+}
+export declare abstract class NodeBaseConnection implements Connection<Stream.Readable> {
+    protected readonly params: NodeConnectionParams;
+    protected readonly agent: Http.Agent;
+    protected readonly headers: Http.OutgoingHttpHeaders;
+    private readonly logger;
+    private readonly retry_expired_sockets;
+    private readonly known_sockets;
+    protected constructor(params: NodeConnectionParams, agent: Http.Agent);
+    protected buildDefaultHeaders(username: string, password: string): Http.OutgoingHttpHeaders;
+    protected abstract createClientRequest(params: RequestParams): Http.ClientRequest;
+    private request;
+    private _request;
+    ping(): Promise<boolean>;
+    query(params: ConnBaseQueryParams): Promise<ConnQueryResult<Stream.Readable>>;
+    exec(params: ConnBaseQueryParams): Promise<ConnExecResult<Stream.Readable>>;
+    insert(params: ConnInsertParams<Stream.Readable>): Promise<ConnInsertResult>;
+    close(): Promise<void>;
+    private logResponse;
+}