WIP: Refactor client to support custom connections

.build/update_version.ts

@@ -1,4 +1,4 @@
-import version from '../src/version'
+import version from '../packages/common/src/version'
 import packageJson from '../package.json'
 import fs from 'fs'
 ;(async () => {

__tests__/integration/abort_request.test.ts

@@ -1,6 +1,5 @@
-import { AbortController } from 'node-abort-controller'
-import type { Row } from '../../src'
-import { type ClickHouseClient, type ResponseJSON } from '../../src'
+import type { Row } from 'client/src'
+import { type ClickHouseClient, type ResponseJSON } from 'client/src'
 import { createTestClient, guid, makeObjectStream } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 import type Stream from 'stream'

__tests__/integration/auth.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient } from '../../src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 
 describe('authentication', () => {

__tests__/integration/clickhouse_settings.test.ts

@@ -1,5 +1,5 @@
-import type { ClickHouseClient, InsertParams } from '../../src'
-import { SettingsMap } from '../../src'
+import type { ClickHouseClient, InsertParams } from 'client/src'
+import { SettingsMap } from 'client/src'
 import { createTestClient, guid } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 

__tests__/integration/config.test.ts

@@ -1,8 +1,8 @@
-import type { Logger } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { Logger } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient, retryOnFailure } from '../utils'
 import type { RetryOnFailureOptions } from '../utils/retry'
-import type { ErrorLogParams, LogParams } from '../../src/logger'
+import type { ErrorLogParams, LogParams } from 'client-common/src/logger'
 
 describe('config', () => {
   let client: ClickHouseClient

__tests__/integration/data_types.test.ts

@@ -1,4 +1,4 @@
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 import { v4 } from 'uuid'
 import { randomInt } from 'crypto'

__tests__/integration/date_time.test.ts

@@ -1,5 +1,5 @@
 import { createTableWithFields } from './fixtures/table_with_fields'
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 
 describe('DateTime', () => {

__tests__/integration/error_parsing.test.ts

@@ -1,5 +1,6 @@
-import { type ClickHouseClient, createClient } from '../../src'
 import { createTestClient, getTestDatabaseName } from '../utils'
+import type { ClickHouseClient } from 'client/src'
+import { createClient } from 'client-node/src'
 
 describe('error', () => {
   let client: ClickHouseClient

__tests__/integration/exec.test.ts

@@ -1,15 +1,15 @@
-import type { ExecParams, ResponseJSON } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { ExecParams, ResponseJSON } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import {
   createTestClient,
   getClickHouseTestEnvironment,
   getTestDatabaseName,
   guid,
   TestEnv,
 } from '../utils'
-import { getAsText } from '../../src/utils'
 import * as uuid from 'uuid'
-import type { QueryResult } from '../../src/connection'
+import { getAsText } from 'client-common/src/utils'
+import type { QueryResult } from 'client-common/src/connection'
 
 describe('exec', () => {
   let client: ClickHouseClient

__tests__/integration/fixtures/read_only_user.ts

@@ -4,7 +4,7 @@ import {
   guid,
   TestEnv,
 } from '../../utils'
-import type { ClickHouseClient } from '../../../src'
+import type { ClickHouseClient } from 'client/src'
 
 export async function createReadOnlyUser(client: ClickHouseClient) {
   const username = `clickhousejs__read_only_user_${guid()}`

__tests__/integration/fixtures/simple_table.ts

@@ -1,6 +1,6 @@
 import { createTable, TestEnv } from '../../utils'
-import type { ClickHouseClient } from '../../../src'
-import type { MergeTreeSettings } from '../../../src/settings'
+import type { ClickHouseClient } from 'client/src'
+import type { MergeTreeSettings } from 'client-common/src/settings'
 
 export function createSimpleTable(
   client: ClickHouseClient,
@@ -39,7 +39,7 @@ export function createSimpleTable(
           CREATE TABLE ${tableName} ON CLUSTER '{cluster}'
           (id UInt64, name String, sku Array(UInt8))
           ENGINE ReplicatedMergeTree(
-            '/clickhouse/{cluster}/tables/{database}/{table}/{shard}', 
+            '/clickhouse/{cluster}/tables/{database}/{table}/{shard}',
             '{replica}'
           )
           ORDER BY (id) ${_settings}

__tests__/integration/fixtures/table_with_fields.ts

@@ -1,5 +1,5 @@
 import { createTable, guid, TestEnv } from '../../utils'
-import type { ClickHouseClient, ClickHouseSettings } from '../../../src'
+import type { ClickHouseClient, ClickHouseSettings } from 'client/src'
 
 export async function createTableWithFields(
   client: ClickHouseClient,
@@ -31,7 +31,7 @@ export async function createTableWithFields(
             CREATE TABLE ${tableName} ON CLUSTER '{cluster}'
             (id UInt32, ${fields})
             ENGINE ReplicatedMergeTree(
-              '/clickhouse/{cluster}/tables/{database}/{table}/{shard}', 
+              '/clickhouse/{cluster}/tables/{database}/{table}/{shard}',
               '{replica}'
             )
             ORDER BY (id)

__tests__/integration/fixtures/test_data.ts

@@ -1,4 +1,4 @@
-import type { ClickHouseClient } from '../../../src'
+import type { ClickHouseClient } from 'client/src'
 
 export const jsonValues = [
   { id: '42', name: 'hello', sku: [0, 1] },

__tests__/integration/insert.test.ts

@@ -1,5 +1,5 @@
-import type { ResponseJSON } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { ResponseJSON } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient, guid } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 import { assertJsonValues, jsonValues } from './fixtures/test_data'

__tests__/integration/multiple_clients.test.ts

@@ -1,4 +1,4 @@
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createSimpleTable } from './fixtures/simple_table'
 import { createTestClient, guid } from '../utils'
 import Stream from 'stream'

__tests__/integration/ping.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient } from '../../src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 
 describe('ping', () => {

__tests__/integration/query_log.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient } from '../../src'
+import { type ClickHouseClient } from 'client/src'
 import {
   createTestClient,
   guid,

__tests__/integration/read_only_user.test.ts

@@ -1,4 +1,4 @@
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTestClient, getTestDatabaseName, guid } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 import { createReadOnlyUser } from './fixtures/read_only_user'

__tests__/integration/request_compression.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient, type ResponseJSON } from '../../src'
+import { type ClickHouseClient, type ResponseJSON } from 'client/src'
 import { createTestClient, guid } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 

__tests__/integration/response_compression.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient } from '../../src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 
 describe('response compression', () => {

__tests__/integration/schema_e2e.test.ts

@@ -1,7 +1,7 @@
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTableWithSchema, createTestClient, guid } from '../utils'
-import * as ch from '../../src/schema'
-import { And, Eq, Or } from '../../src/schema'
+import * as ch from 'client/src/schema'
+import { And, Eq, Or } from 'client/src/schema'
 
 describe('schema e2e test', () => {
   let client: ClickHouseClient

__tests__/integration/schema_types.test.ts

@@ -1,7 +1,7 @@
-import type { ClickHouseClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTableWithSchema, createTestClient, guid } from '../utils'
 
-import * as ch from '../../src/schema'
+import * as ch from 'client/src/schema'
 
 describe('schema types', () => {
   let client: ClickHouseClient

__tests__/integration/select.test.ts

@@ -1,5 +1,5 @@
 import type Stream from 'stream'
-import { type ClickHouseClient, type ResponseJSON, type Row } from '../../src'
+import { type ClickHouseClient, type ResponseJSON, type Row } from 'client/src'
 import { createTestClient, guid } from '../utils'
 import * as uuid from 'uuid'
 

__tests__/integration/select_query_binding.test.ts

@@ -1,5 +1,5 @@
-import type { QueryParams } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { QueryParams } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 
 describe('select with query binding', () => {

__tests__/integration/stream_json_formats.test.ts

@@ -1,4 +1,4 @@
-import { type ClickHouseClient } from '../../src'
+import { type ClickHouseClient } from 'client/src'
 import Stream from 'stream'
 import { createTestClient, guid, makeObjectStream } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'

__tests__/integration/stream_raw_formats.test.ts

@@ -1,9 +1,9 @@
 import { createTestClient, guid, makeRawStream } from '../utils'
-import type { ClickHouseClient, ClickHouseSettings } from '../../src'
+import type { ClickHouseClient, ClickHouseSettings } from 'client/src'
 import { createSimpleTable } from './fixtures/simple_table'
 import Stream from 'stream'
 import { assertJsonValues, jsonValues } from './fixtures/test_data'
-import type { RawDataFormat } from '../../src/data_formatter'
+import type { RawDataFormat } from 'client-common/src/data_formatter'
 
 describe('stream raw formats', () => {
   let client: ClickHouseClient

__tests__/integration/streaming_e2e.test.ts

@@ -2,8 +2,8 @@ import Fs from 'fs'
 import Path from 'path'
 import Stream from 'stream'
 import split from 'split2'
-import type { Row } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { Row } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import { createTestClient, guid } from '../utils'
 import { createSimpleTable } from './fixtures/simple_table'
 

__tests__/integration/watch_stream.test.ts

@@ -1,5 +1,5 @@
-import type { Row } from '../../src'
-import { type ClickHouseClient } from '../../src'
+import type { Row } from 'client/src'
+import { type ClickHouseClient } from 'client/src'
 import {
   createTable,
   createTestClient,

__tests__/tls/tls.test.ts

@@ -1,7 +1,7 @@
-import type { ClickHouseClient } from '../../src'
-import { createClient } from '../../src'
+import type { ClickHouseClient } from 'client/src'
 import { createTestClient } from '../utils'
 import * as fs from 'fs'
+import { createClient } from 'client-node/src'
 
 describe('TLS connection', () => {
   let client: ClickHouseClient

__tests__/unit/client.test.ts

@@ -1,5 +1,5 @@
-import type { ClickHouseClientConfigOptions } from '../../src'
-import { createClient } from '../../src'
+import type { ClickHouseClientConfigOptions } from 'client/src'
+import { createClient } from 'client-node/src'
 
 describe('createClient', () => {
   it('throws on incorrect "host" config value', () => {
@@ -9,7 +9,7 @@ describe('createClient', () => {
   })
 
   it('should not mutate provided configuration', async () => {
-    const config: ClickHouseClientConfigOptions = {
+    const config: Omit<ClickHouseClientConfigOptions, 'connection'> = {
       host: 'http://localhost',
     }
     createClient(config)

__tests__/unit/encode_values.test.ts

@@ -1,6 +1,6 @@
 import Stream from 'stream'
-import { encodeValues } from '../../src/client'
-import type { DataFormat, InputJSON, InputJSONObjectEachRow } from '../../src'
+import { encodeValues } from 'client/src/client'
+import type { DataFormat, InputJSON, InputJSONObjectEachRow } from 'client/src'
 
 describe('encodeValues', () => {
   const rawFormats = [

__tests__/unit/format_query_params.test.ts

@@ -1,4 +1,4 @@
-import { formatQueryParams } from '../../src/data_formatter'
+import { formatQueryParams } from 'client-common/src/data_formatter'
 
 // JS always creates Date object in local timezone,
 // so we might need to convert the date to another timezone

__tests__/unit/format_query_settings.test.ts

@@ -1,5 +1,5 @@
-import { formatQuerySettings } from '../../src/data_formatter'
-import { SettingsMap } from '../../src'
+import { formatQuerySettings } from 'client-common/src/data_formatter'
+import { SettingsMap } from 'client/src'
 
 describe('formatQuerySettings', () => {
   it('formats boolean', () => {

__tests__/unit/logger.test.ts

@@ -1,5 +1,9 @@
-import type { ErrorLogParams, Logger, LogParams } from '../../src/logger'
-import { LogWriter } from '../../src/logger'
+import type {
+  ErrorLogParams,
+  Logger,
+  LogParams,
+} from 'client-common/src/logger'
+import { LogWriter } from 'client-common/src/logger'
 
 describe('Logger', () => {
   type LogLevel = 'debug' | 'info' | 'warn' | 'error'

__tests__/unit/node_connection.test.ts

@@ -0,0 +1,27 @@
+import { createConnection } from 'client-node/src'
+import { NodeHttpConnection } from 'client-node/src/node_http_connection'
+import { NodeHttpsConnection } from 'client-node/src/node_https_connection'
+
+describe('Node.js connection', () => {
+  it('should create HTTP adapter', async () => {
+    const adapter = createConnection({
+      url: new URL('http://localhost'),
+    } as any)
+    expect(adapter).toBeInstanceOf(NodeHttpConnection)
+  })
+
+  it('should create HTTPS adapter', async () => {
+    const adapter = createConnection({
+      url: new URL('https://localhost'),
+    } as any)
+    expect(adapter).toBeInstanceOf(NodeHttpsConnection)
+  })
+
+  it('should throw if the supplied protocol is unknown', async () => {
+    expect(() =>
+      createConnection({
+        url: new URL('tcp://localhost'),
+      } as any)
+    ).toThrowError('Only HTTP(s) adapters are supported')
+  })
+})