1.0.5

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "private": false,
   "description": "an odm for talking to clickhouse",
   "main": "dist_ts/index.js",
@@ -9,7 +9,9 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web)",
+    "createGrafana": "docker run --name grafana -d -p 4000:3000 grafana/grafana-oss",
+    "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.25",
@@ -21,7 +23,7 @@
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "clickhouse": "^2.4.4"
+    "@depyronick/clickhouse-client": "^1.0.12"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.ts

@@ -1,12 +1,12 @@
 import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
 import * as smartclickhouse from '../ts/index';
 
-let testClickhouseDb: smartclickhouse.ClickhouseDb;
+let testClickhouseDb: smartclickhouse.SmartClickHouseDb;
 
 tap.test('first test', async () => {
-  testClickhouseDb = new smartclickhouse.ClickhouseDb({
+  testClickhouseDb = new smartclickhouse.SmartClickHouseDb({
-    url: 'http://localhost',
+    host: 'localhost',
-	  port: 8123,
+    database: 'test2'
   });
 });
 
@@ -14,32 +14,27 @@ tap.test('should start the clickhouse db', async () => {
   await testClickhouseDb.start();
 })
 
-tap.test('should write something to the clickhouse db', async () => {
+tap.test('should create a timedatatable', async () => {
-  const result = await testClickhouseDb.clickhouseClient.query(`CREATE DATABASE IF NOT EXISTS lossless`).toPromise();
+  testClickhouseDb.getTable('analytics')
-  console.log(result);
+})
-  const result2 = await testClickhouseDb.clickhouseClient.query(`CREATE TABLE IF NOT EXISTS lossless.visits (
+
+tap.skip.test('should write something to the clickhouse db', async () => {
+  const result2 = await testClickhouseDb.clickhouseClient.queryPromise(`CREATE TABLE IF NOT EXISTS visits2 (
     timestamp UInt64,
     ip String,
     os String,
     userAgent String,
     version String
-  ) ENGINE=MergeTree() ORDER BY timestamp`).toPromise();
+  ) ENGINE=MergeTree() ORDER BY timestamp`);
-  console.log(result2);
+  const result3 = await testClickhouseDb.clickhouseClient.insertPromise('visits2', [
-  const ws = testClickhouseDb.clickhouseClient.insert('INSERT INTO lossless.visits FORMAT JSONEachRow').stream();
+    {
-  for(let i = 0; i <= 1000; i++) {
+      timestamp: Date.now(),
-    await ws.writeRow(
+      ip: '127.0.01',
-      JSON.stringify({
+      os: 'Mac OS X',
-        timestamp: Date.now(),
+      userAgent: 'some',
-        ip: '127.0.01',
+      version: 'someversion'
-        os: 'Mac OS X',
+    }
-        userAgent: 'some',
+  ]);
-        version: 'someversion'
-      })
-    );
-  }
-
-  //wait stream finish
-  const result3 = await ws.exec();
 })
 
 tap.start();

ts/index.ts

@@ -1,26 +1,2 @@
-import * as plugins from './smartclickhouse.plugins';
+export * from './smartclickhouse.classes.smartclickhouse';
-
+export * from './smartclickhouse.classes.timedatatable';
-export interface IClickhouseConstructorOptions {
-  url: string;
-  port?: number;
-}
-
-export class ClickhouseDb {
-  public options: IClickhouseConstructorOptions;
-  public clickhouseClient: plugins.clickhouse.ClickHouse;
-
-  constructor(optionsArg: IClickhouseConstructorOptions) {
-    this.options = optionsArg;
-  }
-
-  /**
-   * starts the connection to the Clickhouse db
-   */
-  public start() {
-    this.clickhouseClient = new plugins.clickhouse.ClickHouse({
-      ...this.options,
-      basicAuth: null,
-      format: 'json'
-    });
-  }
-}

ts/smartclickhouse.classes.smartclickhouse.ts

@@ -0,0 +1,49 @@
+import * as plugins from './smartclickhouse.plugins';
+import { TimeDataTable } from './smartclickhouse.classes.timedatatable';
+
+export interface IClickhouseConstructorOptions {
+  host: string;
+  database: string;
+  password?: string;
+}
+
+
+
+export class SmartClickHouseDb {
+  public options: IClickhouseConstructorOptions;
+  public clickhouseClient: plugins.clickhouse.ClickHouseClient;
+
+  constructor(optionsArg: IClickhouseConstructorOptions) {
+    this.options = optionsArg;
+  }
+
+  /**
+   * starts the connection to the Clickhouse db
+   */
+  public async start() {
+    console.log(`Connecting to default database first.`)
+    const defaultClient = new plugins.clickhouse.ClickHouseClient({
+      ...this.options,
+      database: 'default'
+    });
+    console.log(`Create database ${this.options.database}, if it does not exist...`);
+    await defaultClient.queryPromise(`CREATE DATABASE IF NOT EXISTS ${this.options.database}`);
+
+    console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`)
+    this.clickhouseClient = new plugins.clickhouse.ClickHouseClient({
+      ...this.options,
+
+    });
+    console.log(`trying to ping database...`);
+    const result = await this.clickhouseClient.ping();
+    console.log(`Ping successfull?: ${result}`);
+    
+  }
+
+  /**
+   * gets a table
+   */
+  public async getTable(tableName: string) {
+    const newTable = TimeDataTable.getTable(this, tableName);
+  }
+}

ts/smartclickhouse.classes.timedatatable.ts

@@ -0,0 +1,29 @@
+import * as plugins from './smartclickhouse.plugins';
+import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse';
+
+export class TimeDataTable {
+  public static async getTable (smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
+    const newTable = new TimeDataTable(smartClickHouseDbRefArg, tableNameArg);
+
+    // create table in clickhouse
+    await smartClickHouseDbRefArg.clickhouseClient.queryPromise(`CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
+      timestamp DateTime64(3, 'Europe/Berlin'),
+      message String
+    ) ENGINE=MergeTree() ORDER BY timestamp`);
+    return newTable;
+  }
+
+  // INSTANCE
+  public smartClickHouseDbRef: SmartClickHouseDb;
+  public tableName: string;
+
+  constructor(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
+    this.smartClickHouseDbRef = smartClickHouseDbRefArg;
+    this.tableName = tableNameArg;
+  }
+
+  /**
+   * stores a json and tries to map it to the nested syntax
+   */
+  public async storeJson () {}
+}

ts/smartclickhouse.plugins.ts

@@ -1,4 +1,4 @@
-import * as clickhouse from 'clickhouse';
+import * as clickhouse from '@depyronick/clickhouse-client';
 
 export {
   clickhouse