2.0.3

.vscode/settings.json

@@ -22,5 +22,6 @@
         }
       }
     }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

package.json

@@ -1,27 +1,32 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "1.0.4",
+  "version": "2.0.3",
   "private": false,
   "description": "an odm for talking to clickhouse",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "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",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^2.0.6",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.72",
-    "@pushrocks/tapbundle": "^4.0.8",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^17.0.21",
+    "@types/node": "^18.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@depyronick/clickhouse-client": "^1.0.12"
+    "@depyronick/clickhouse-client": "^1.0.14",
+    "@pushrocks/smartobject": "^1.0.10",
+    "@pushrocks/smarturl": "^3.0.1"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.nonci.ts

@@ -0,0 +1,38 @@
+import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
+import * as smartclickhouse from '../ts/index.js';
+
+let testClickhouseDb: smartclickhouse.SmartClickHouseDb;
+
+tap.test('first test', async () => {
+  testClickhouseDb = new smartclickhouse.SmartClickHouseDb({
+    host: 'localhost',
+    database: 'test2',
+    port: 8123,
+    protocol: 'http',
+  });
+});
+
+tap.test('should start the clickhouse db', async () => {
+  await testClickhouseDb.start(true);
+});
+
+tap.test('should create a timedatatable', async () => {
+  const table = await testClickhouseDb.getTable('analytics');
+  let i = 0;
+  while(i < 10) {
+    await table.addData({
+      timestamp: Date.now(),
+      message: `hello this is a message ${i}`,
+      wow: 'hey',
+      deep: {
+        so: 'hello',
+        myArray: ['array1', 'array2']
+      }
+    });
+    i++;
+  }
+});
+
+tap.skip.test('should write something to the clickhouse db', async () => {});
+
+tap.start();

test/test.ts

@@ -1,36 +0,0 @@
-import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
-import * as smartclickhouse from '../ts/index';
-
-let testClickhouseDb: smartclickhouse.SmartClickHouseDb;
-
-tap.test('first test', async () => {
-  testClickhouseDb = new smartclickhouse.SmartClickHouseDb({
-    host: 'localhost',
-    database: 'test2'
-  });
-});
-
-tap.test('should start the clickhouse db', async () => {
-  await testClickhouseDb.start();
-})
-
-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`);
-  const result3 = await testClickhouseDb.clickhouseClient.insertPromise('visits2', [
-    {
-      timestamp: Date.now(),
-      ip: '127.0.01',
-      os: 'Mac OS X',
-      userAgent: 'some',
-      version: 'someversion'
-    }
-  ]);
-})
-
-tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartclickhouse',
+  version: '2.0.3',
+  description: 'an odm for talking to clickhouse'
+}

ts/index.ts

@@ -1,2 +1,2 @@
-export * from './smartclickhouse.classes.smartclickhouse';
+export * from './smartclickhouse.classes.smartclickhouse.js';
-export * from './smartclickhouse.classes.timedatatable';
+export * from './smartclickhouse.classes.timedatatable.js';

ts/smartclickhouse.classes.smartclickhouse.ts

@@ -1,14 +1,12 @@
-import * as plugins from './smartclickhouse.plugins';
+import * as plugins from './smartclickhouse.plugins.js';
-import { TimeDataTable } from './smartclickhouse.classes.timedatatable';
+import { TimeDataTable } from './smartclickhouse.classes.timedatatable.js';
 
 export interface IClickhouseConstructorOptions {
-  host: string;
+  url: string;
   database: string;
   password?: string;
 }
 
-
-
 export class SmartClickHouseDb {
   public options: IClickhouseConstructorOptions;
   public clickhouseClient: plugins.clickhouse.ClickHouseClient;
@@ -20,24 +18,37 @@ export class SmartClickHouseDb {
   /**
    * starts the connection to the Clickhouse db
    */
-  public async start() {
+  public async start(dropOld = false) {
-    console.log(`Connecting to default database first.`)
+    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'
+      database: 'default',
     });
     console.log(`Create database ${this.options.database}, if it does not exist...`);
+    if (dropOld) {
+      await defaultClient.queryPromise(`DROP DATABASE IF EXISTS ${this.options.database}`);
+    }
     await defaultClient.queryPromise(`CREATE DATABASE IF NOT EXISTS ${this.options.database}`);
 
-    console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`)
+    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();
     console.log(`Ping successfull?: ${result}`);
-    
   }
 
   /**
@@ -45,5 +56,6 @@ export class SmartClickHouseDb {
    */
   public async getTable(tableName: string) {
     const newTable = TimeDataTable.getTable(this, tableName);
+    return newTable;
   }
 }

ts/smartclickhouse.classes.timedatatable.ts

@@ -1,20 +1,170 @@
-import * as plugins from './smartclickhouse.plugins';
+import * as plugins from './smartclickhouse.plugins.js';
-import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse';
+import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse.js';
+
+export type TClickhouseColumnDataType = 'String' | "DateTime64(3, 'Europe/Berlin')" | 'Float64' | 'Array(String)' | 'Array(Float64)';
+export interface IColumnInfo {
+  database: string;
+  table: string;
+  name: string;
+  type: TClickhouseColumnDataType;
+  position: string;
+  default_kind: string;
+  default_expression: string;
+  data_compressed_bytes: string;
+  data_uncompressed_bytes: string;
+  marks_bytes: string;
+  comment: string;
+  is_in_partition_key: 0 | 1;
+  is_in_sorting_key: 0 | 1;
+  is_in_primary_key: 0 | 1;
+  is_in_sampling_key: 0 | 1;
+  compression_codec: string;
+  character_octet_length: null;
+  numeric_precision: null;
+  numeric_precision_radix: null;
+  numeric_scale: null;
+  datetime_precision: '3';
+}
+
+export interface ITimeDataTableOptions {
+  tableName: string;
+  retainDataForDays: number;
+}
 
 export class TimeDataTable {
   public static async getTable(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
-    const newTable = new TimeDataTable(smartClickHouseDbRefArg, tableNameArg);
+    const newTable = new TimeDataTable(smartClickHouseDbRefArg, {
+      tableName: tableNameArg,
+      retainDataForDays: 30
+    });
 
     // create table in clickhouse
-    smartClickHouseDbRefArg;
+    await smartClickHouseDbRefArg.clickhouseClient
+      .queryPromise(`
+        CREATE TABLE IF NOT EXISTS ${newTable.options.tableName} (
+          timestamp DateTime64(3, 'Europe/Berlin'),
+          message String
+        ) ENGINE=MergeTree() ORDER BY timestamp`);
+    
+    // lets adjust the TTL
+    await smartClickHouseDbRefArg.clickhouseClient
+      .queryPromise(`
+        ALTER TABLE ${newTable.options.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL ${newTable.options.retainDataForDays} DAY
+      `);
+
+    await newTable.updateColumns();
+    console.log(`=======================`)
+    console.log(
+      `table with name "${newTable.options.tableName}" in databse ${newTable.smartClickHouseDbRef.options.database} has the following columns:`
+    );
+    for (const column of newTable.columns) {
+      console.log(`>> ${column.name}: ${column.type}`);
+    }
+    console.log('^^^^^^^^^^^^^^\n');
+
+    return newTable;
   }
 
   // INSTANCE
   public smartClickHouseDbRef: SmartClickHouseDb;
-  public tableName: string;
+  public options: ITimeDataTableOptions;
 
-  constructor(smartClickHouseDbRefArg: SmartClickHouseDb,tableNameArg: string) {
+  constructor(smartClickHouseDbRefArg: SmartClickHouseDb, optionsArg: ITimeDataTableOptions) {
     this.smartClickHouseDbRef = smartClickHouseDbRefArg;
-    this.tableName = tableNameArg;
+    this.options = optionsArg;
+  }
+
+  public columns: IColumnInfo[] = [];
+
+  /**
+   * updates the columns
+   */
+  public async updateColumns() {
+    this.columns = await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+      SELECT * FROM system.columns
+      WHERE database LIKE '${this.smartClickHouseDbRef.options.database}'
+      AND table LIKE '${this.options.tableName}'
+    `);
+    return this.columns;
+  }
+
+  /**
+   * stores a json and tries to map it to the nested syntax
+   */
+  public async addData(dataArg: any) {
+    // the storageJson
+    let storageJson: { [key: string]: any } = {};
+    
+    // helper stuff
+    
+    const getClickhouseTypeForValue = (valueArg: any): TClickhouseColumnDataType => {
+      const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
+        string: 'String',
+        number: 'Float64',
+        undefined: null,
+        null: null
+      };
+      if (valueArg instanceof Array) {
+        const arrayType = typeConversion[(typeof valueArg[0]) as string];
+        if (!arrayType) {
+          return null;
+        } else {
+          return `Array(${arrayType})` as TClickhouseColumnDataType;
+        }
+      }
+      return typeConversion[(typeof valueArg) as string];
+    }
+    const checkPath = async (pathArg: string, typeArg: TClickhouseColumnDataType, prechecked = false) => {
+      let columnFound = false;
+      for (const column of this.columns) {
+        if (pathArg === column.name) {
+          columnFound = true;
+          break;
+        }
+      }
+      if (!columnFound) {
+        if (!prechecked) {
+          await this.updateColumns();
+          await checkPath(pathArg, typeArg, true);
+          return;
+        }
+        const alterString = `ALTER TABLE ${this.options.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
+        try {
+          await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+          ${alterString}
+        `);
+        } catch(err) {
+          console.log(alterString);
+          for (const column of this.columns) {
+            console.log(column.name);
+          }
+        }
+        await this.updateColumns();
+      }
+    };
+
+    // key checking
+    const flatDataArg = plugins.smartobject.toFlatObject(dataArg);
+    for (const key of Object.keys(flatDataArg)) {
+      const value = flatDataArg[key];
+      if (key === 'timestamp' && typeof value !== 'number') {
+        throw new Error('timestamp must be of type number');
+      } else if (key === 'timestamp') {
+        storageJson.timestamp = flatDataArg[key];
+        continue;
+      }
+      // lets deal with the rest
+      const clickhouseType = getClickhouseTypeForValue(value);
+      if (!clickhouseType) {
+        continue;
+      }
+      await checkPath(key, clickhouseType);
+      storageJson[key] = value;
+    }
+
+    const result = await this.smartClickHouseDbRef.clickhouseClient.insertPromise(this.options.tableName, [
+      storageJson,
+    ]);
+    return result;
   }
 }

ts/smartclickhouse.plugins.ts

@@ -1,5 +1,13 @@
-import * as clickhouse from '@depyronick/clickhouse-client';
+// @pushrocks scope
+import * as smartobject from '@pushrocks/smartobject';
+import * as smarturl from '@pushrocks/smarturl';
 
 export {
-  clickhouse
+  smartobject,
+  smarturl
 }
+
+// thirdparty
+import * as clickhouse from '@depyronick/clickhouse-client';
+
+export { clickhouse };

tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node12"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}