fix(core): update

package.json

@@ -15,17 +15,18 @@
     "createClickhouse": "docker run --name some-clickhouse-server --ulimit nofile=262144:262144 -p 8123:8123 -p 9000:9000  --volume=$PWD/.nogit/testdatabase:/var/lib/clickhouse yandex/clickhouse-server"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tsbundle": "^2.0.3",
+    "@gitzone/tsbundle": "^2.0.6",
-    "@gitzone/tstest": "^1.0.71",
+    "@gitzone/tstest": "^1.0.72",
-    "@pushrocks/tapbundle": "^5.0.3",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^17.0.33",
+    "@types/node": "^18.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@depyronick/clickhouse-client": "^1.0.13",
+    "@depyronick/clickhouse-client": "^1.0.14",
-    "@pushrocks/smartobject": "^1.0.10"
+    "@pushrocks/smartobject": "^1.0.10",
+    "@pushrocks/smarturl": "^3.0.1"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.nonci.ts

@@ -7,6 +7,8 @@ tap.test('first test', async () => {
   testClickhouseDb = new smartclickhouse.SmartClickHouseDb({
     host: 'localhost',
     database: 'test2',
+    port: 8123,
+    protocol: 'http',
   });
 });
 

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartclickhouse',
-  version: '2.0.2',
+  version: '2.0.3',
   description: 'an odm for talking to clickhouse'
 }

ts/smartclickhouse.classes.smartclickhouse.ts

@@ -2,7 +2,7 @@ import * as plugins from './smartclickhouse.plugins.js';
 import { TimeDataTable } from './smartclickhouse.classes.timedatatable.js';
 
 export interface IClickhouseConstructorOptions {
-  host: string;
+  url: string;
   database: string;
   password?: string;
 }
@@ -20,8 +20,20 @@ export class SmartClickHouseDb {
    */
   public async start(dropOld = false) {
     console.log(`Connecting to default database first.`);
+    const defaultOptions: {[keyArg: string]: string} = {};
+    // the protocol, url and host
+    const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(this.options.url);
+    parsedUrl.protocol === 'https' ? defaultOptions.protocol = plugins.clickhouse.ClickHouseConnectionProtocol.HTTPS : null;
+    parsedUrl.protocol === 'http' ? defaultOptions.protocol = plugins.clickhouse.ClickHouseConnectionProtocol.HTTP : null;
+    defaultOptions.host = parsedUrl.hostname;
+    defaultOptions.port = parsedUrl.port;
+    // the database
+    defaultOptions.database = this.options.database;
+    // the password
+    this.options.password ? defaultOptions.password = this.options.password : null;
+    // lets connect
     const defaultClient = new plugins.clickhouse.ClickHouseClient({
-      ...this.options,
+      ...defaultOptions,
       database: 'default',
     });
     console.log(`Create database ${this.options.database}, if it does not exist...`);
@@ -32,7 +44,7 @@ export class SmartClickHouseDb {
 
     console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`);
     this.clickhouseClient = new plugins.clickhouse.ClickHouseClient({
-      ...this.options,
+      ...defaultOptions
     });
     console.log(`trying to ping database...`);
     const result = await this.clickhouseClient.ping();

ts/smartclickhouse.plugins.ts

@@ -1,8 +1,10 @@
 // @pushrocks scope
 import * as smartobject from '@pushrocks/smartobject';
+import * as smarturl from '@pushrocks/smarturl';
 
 export {
-  smartobject
+  smartobject,
+  smarturl
 }
 
 // thirdparty