@hemia/db-connector 0.0.5 → 0.0.7

package/dist/hemia-db-connector.esm.js

@@ -52,7 +52,10 @@ class OLAPConnector {
 class ClickHouseConnector extends OLAPConnector {
     constructor(credentials) {
         super();
+        this.client = null;
         this.credentials = credentials;
+    }
+    buildConnectionUrl() {
         let url;
         if (this.credentials.host.match(/^https?:\/\/.+:\d+$/)) {
             url = this.credentials.host;
@@ -65,16 +68,24 @@ class ClickHouseConnector extends OLAPConnector {
             const port = this.credentials.port || 8123;
             url = `http://${this.credentials.host}:${port}`;
         }
-        this.client = createClient({
-            url,
-            username: this.credentials.user,
-            password: this.credentials.password,
-            database: this.credentials.database,
-        });
+        return url;
+    }
+    ensureClient() {
+        if (!this.client) {
+            const url = this.buildConnectionUrl();
+            this.client = createClient({
+                url,
+                username: this.credentials.user,
+                password: this.credentials.password,
+                database: this.credentials.database,
+            });
+        }
+        return this.client;
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            const isConnected = yield this.client.ping();
+            const client = this.ensureClient();
+            const isConnected = yield client.ping();
             if (!isConnected) {
                 throw new Error('ClickHouse connection failed.');
             }
@@ -82,12 +93,25 @@ class ClickHouseConnector extends OLAPConnector {
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.close();
+            if (this.client) {
+                yield this.client.close();
+                this.client = null;
+            }
+        });
+    }
+    isConnected() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.client) {
+                return false;
+            }
+            const isConnected = yield this.client.ping();
+            return isConnected ? true : false;
         });
     }
     query(sql) {
         return __awaiter(this, void 0, void 0, function* () {
-            const resultSet = yield this.client.query({
+            const client = this.ensureClient();
+            const resultSet = yield client.query({
                 query: sql,
                 format: 'JSONEachRow',
             });
@@ -96,8 +120,9 @@ class ClickHouseConnector extends OLAPConnector {
     }
     insert(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const client = this.ensureClient();
             const { table, values, format = 'JSONEachRow' } = options;
-            yield this.client.insert({
+            yield client.insert({
                 table,
                 values: values,
                 format: format,
@@ -756,4 +781,4 @@ class DBConnector {
 }
 DBConnector.instance = null;
 
-export { CoreSqlTypes, DBConnector, DBError, DBNoSQLType, DBSQLType, MySQLConnectionError, NoSQLConnector, SqlConnector };
+export { ClickHouseConnector, CoreSqlTypes, DBConnector, DBError, DBNoSQLType, DBOLAPType, DBSQLType, MySQLConnectionError, NoSQLConnector, OLAPConnector, SqlConnector };

package/dist/hemia-db-connector.js

@@ -52,7 +52,10 @@ class OLAPConnector {
 class ClickHouseConnector extends OLAPConnector {
     constructor(credentials) {
         super();
+        this.client = null;
         this.credentials = credentials;
+    }
+    buildConnectionUrl() {
         let url;
         if (this.credentials.host.match(/^https?:\/\/.+:\d+$/)) {
             url = this.credentials.host;
@@ -65,16 +68,24 @@ class ClickHouseConnector extends OLAPConnector {
             const port = this.credentials.port || 8123;
             url = `http://${this.credentials.host}:${port}`;
         }
-        this.client = client.createClient({
-            url,
-            username: this.credentials.user,
-            password: this.credentials.password,
-            database: this.credentials.database,
-        });
+        return url;
+    }
+    ensureClient() {
+        if (!this.client) {
+            const url = this.buildConnectionUrl();
+            this.client = client.createClient({
+                url,
+                username: this.credentials.user,
+                password: this.credentials.password,
+                database: this.credentials.database,
+            });
+        }
+        return this.client;
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            const isConnected = yield this.client.ping();
+            const client = this.ensureClient();
+            const isConnected = yield client.ping();
             if (!isConnected) {
                 throw new Error('ClickHouse connection failed.');
             }
@@ -82,12 +93,25 @@ class ClickHouseConnector extends OLAPConnector {
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.close();
+            if (this.client) {
+                yield this.client.close();
+                this.client = null;
+            }
+        });
+    }
+    isConnected() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.client) {
+                return false;
+            }
+            const isConnected = yield this.client.ping();
+            return isConnected ? true : false;
         });
     }
     query(sql) {
         return __awaiter(this, void 0, void 0, function* () {
-            const resultSet = yield this.client.query({
+            const client = this.ensureClient();
+            const resultSet = yield client.query({
                 query: sql,
                 format: 'JSONEachRow',
             });
@@ -96,8 +120,9 @@ class ClickHouseConnector extends OLAPConnector {
     }
     insert(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const client = this.ensureClient();
             const { table, values, format = 'JSONEachRow' } = options;
-            yield this.client.insert({
+            yield client.insert({
                 table,
                 values: values,
                 format: format,
@@ -674,12 +699,12 @@ class SQLConnectionManager {
     }
 }
 
-var DBOLAPType;
+exports.DBOLAPType = void 0;
 (function (DBOLAPType) {
     DBOLAPType["ClickHouse"] = "ClickHouse";
     DBOLAPType["Druid"] = "Druid";
     DBOLAPType["Snowflake"] = "Snowflake";
-})(DBOLAPType || (DBOLAPType = {}));
+})(exports.DBOLAPType || (exports.DBOLAPType = {}));
 
 class DBConnector {
     constructor() {
@@ -708,7 +733,7 @@ class DBConnector {
             else if (Object.values(exports.DBSQLType).includes(type)) {
                 this.connection = SQLConnectionManager.getInstance(type, credentials);
             }
-            else if (Object.values(DBOLAPType).includes(type)) {
+            else if (Object.values(exports.DBOLAPType).includes(type)) {
                 this.connection = new ClickHouseConnector(credentials);
             }
             else {
@@ -741,7 +766,7 @@ class DBConnector {
             else if (Object.values(exports.DBSQLType).includes(type)) {
                 this.connection = SQLConnectionManager.getInstance(type, credentials);
             }
-            else if (Object.values(DBOLAPType).includes(type)) {
+            else if (Object.values(exports.DBOLAPType).includes(type)) {
                 this.connection = new ClickHouseConnector(credentials);
             }
             else {
@@ -784,10 +809,12 @@ Object.defineProperty(exports, "fn", {
     enumerable: true,
     get: function () { return sequelize.fn; }
 });
+exports.ClickHouseConnector = ClickHouseConnector;
 exports.DBConnector = DBConnector;
 exports.DBError = DBError;
 exports.MySQLConnectionError = MySQLConnectionError;
 exports.NoSQLConnector = NoSQLConnector;
+exports.OLAPConnector = OLAPConnector;
 exports.SqlConnector = SqlConnector;
 Object.keys(mongoose).forEach(function (k) {
     if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {

package/dist/types/Core/ClickHouseConnector.d.ts

@@ -4,8 +4,11 @@ export declare class ClickHouseConnector extends OLAPConnector {
     private client;
     private credentials;
     constructor(credentials: CredentialsConnection);
+    private buildConnectionUrl;
+    private ensureClient;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    isConnected(): Promise<boolean>;
     query<T = unknown>(sql: string): Promise<T[]>;
     insert<F extends ClickHouseInsertFormat = 'JSONEachRow'>(options: InsertOptions<F>): Promise<void>;
     find<T = unknown>(table: string, filters?: Record<string, any>): Promise<T[]>;

package/dist/types/abstract/OLAPConnector.d.ts

@@ -8,6 +8,7 @@ export interface InsertOptions<F extends ClickHouseInsertFormat = 'JSONEachRow'>
 export declare abstract class OLAPConnector {
     abstract connect(): Promise<void>;
     abstract disconnect(): Promise<void>;
+    abstract isConnected(): Promise<boolean>;
     abstract query<T = unknown>(sql: string): Promise<T[]>;
     abstract insert<F extends ClickHouseInsertFormat = 'JSONEachRow'>(options: InsertOptions<F>): Promise<void>;
     abstract find<T = unknown>(table: string, filters: Record<string, any>): Promise<T[]>;

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export { Recorset } from './types/RecordSet';
 export { DBConnector } from "./DBConnector";
 export { DBSQLType } from "./types/DBSQLTypes";
 export { DBNoSQLType } from "./types/DBNoSQLTypes";
+export { DBOLAPType } from "./types/OLAPTypes";
 export { NoSQLConnector } from "./abstract/NoSQLConnector";
 export { SqlConnector, Filter } from "./abstract/SQLConnector";
 export { NoSQLOptions } from "./types/NoSQLOptions";
@@ -11,3 +12,5 @@ export * from 'mongoose';
 export { Model as ModelSequelize, Sequelize, DataTypes, CreateOptions, UpdateOptions, DestroyOptions, FindOptions, Attributes, WhereOptions, QueryOptions, InferAttributes, CreationAttributes, InferCreationAttributes, QueryTypes, QueryOptionsWithType, Transaction, Op, fn } from "sequelize";
 export { DBError } from "./errors/DBError";
 export { MySQLConnectionError } from "./errors/MySQLConnectionError";
+export { OLAPConnector, InsertOptions, ClickHouseInsertFormat, ClickHouseInsertValues } from './abstract/OLAPConnector';
+export { ClickHouseConnector } from './Core/ClickHouseConnector';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hemia/db-connector",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Hemia Database Conector",
   "main": "dist/hemia-db-connector.js",
   "module": "dist/hemia-db-connector.esm.js",