ztechno_core 0.0.11 → 0.0.13

package/lib/sql_service.d.ts

@@ -1,8 +1,16 @@
 import * as mysql from 'mysql';
+type ZOnErrorCallback = (err: mysql.MysqlError) => any;
+type ZOnLogCallback = (log: string) => any;
 export declare class ZSqlService {
-  private credentials;
-  constructor(credentials: mysql.ConnectionConfig);
-  connect(): Promise<mysql.Connection>;
+  private pool;
+  private defaultPoolconfig;
+  private listeners;
+  constructor(options: mysql.PoolConfig);
+  on(eventName: 'err', listener: ZOnErrorCallback): any;
+  on(eventName: 'log', listener: ZOnLogCallback): any;
+  private triggerEvent;
+  private getPoolConnection;
   query(sql: string, escaped?: any[]): Promise<any>;
-  static get(credentials?: mysql.ConnectionConfig): ZSqlService;
+  static get(options: mysql.PoolConfig): ZSqlService;
 }
+export {};

package/lib/sql_service.js

@@ -43,36 +43,61 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZSqlService = void 0;
 const mysql = __importStar(require('mysql'));
 let instance = null;
-const logError = (err) => {
+const handleError = (err) => {
   if (err) throw err;
 };
 class ZSqlService {
-  constructor(credentials) {
-    this.credentials = credentials;
+  constructor(options) {
+    this.defaultPoolconfig = {
+      timeout: 20000,
+      connectTimeout: 10,
+    };
+    this.listeners = { err: [], log: [] };
+    this.pool = mysql.createPool(Object.assign({}, this.defaultPoolconfig, options));
+    this.pool.on('connection', (connection) => {
+      connection.on('error', (err) => {
+        this.triggerEvent('err', err);
+      });
+      connection.on('close', (err) => {
+        this.triggerEvent('err', err);
+      });
+    });
+  }
+  on(eventName, listener) {
+    if (!this.listeners.hasOwnProperty(eventName))
+      throw new Error(`EventName not supported for ZSqlService.on(${eventName}, ...)`);
+    this.listeners[eventName].push(listener);
+  }
+  triggerEvent(eventName, args) {
+    this.listeners[eventName].map((listener) => {
+      listener.apply(undefined, args);
+    });
   }
-  connect() {
+  getPoolConnection() {
     return new Promise((resolve, reject) => {
-      const con = mysql.createConnection(this.credentials);
-      con.connect((err) => {
-        if (err) return reject(err);
-        resolve(con);
-      });
+      this.pool.getConnection((err, con) => (err ? reject(err) : resolve(con)));
     });
   }
   async query(sql, escaped = []) {
-    const con = await this.connect();
-    const output = await new Promise((resolve, reject) => {
-      con.query(sql, escaped, (err, result) => {
-        if (err) return reject(err);
-        resolve(result);
-      });
-    });
-    con.end(logError);
-    return output;
+    try {
+      const con = await this.getPoolConnection();
+      try {
+        const output = await new Promise((resolve, reject) => {
+          con.query(sql, escaped, (err, result) => (err ? reject(err) : resolve(result)));
+        });
+        con.release();
+        return output;
+      } catch (err) {
+        con.release();
+        throw err;
+      }
+    } catch (err) {
+      throw err;
+    }
   }
-  static get(credentials) {
+  static get(options) {
     if (instance == null) {
-      instance = new ZSqlService(credentials);
+      instance = new ZSqlService(options);
     }
     return instance;
   }

package/lib/translate_service.js

@@ -13,7 +13,7 @@ class ZTranslateService {
     return this.opt.languages || ['en', 'nl'];
   }
   getSourceLang() {
-    return this.opt.defaultLang || 'en';
+    return this.opt.sourceLang || 'en';
   }
   getDefaultLang() {
     return this.opt.defaultLang || 'en';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",