corefwnode 3.0.2 → 3.0.4

package/lib/Language.js

@@ -1,139 +1,139 @@
-const GeneralHandling = require('./GeneralHandling.js');
-const Translator = require('../objects/Translator.js');
-
-/**
-  * Language class
-  *
-  * module.exports = class providing language methods, translation and language cache filling
-  *
-  * @author  Dario Filkovic <dfilkovi@gmail.com>
-  *
-  * @since 1.0
-  *
-  * @package CoreFw
-  */
-module.exports = class Language
-{
-    /**
-        * constructor()
-        *
-        * Constructor initializing Translator object, Cache and filling language variables
-        *
-        * @author  Dario Filkovic <dfilkovi@gmail.com>
-        *
-        * @since 1.0
-        *
-        * @package CoreFw
-        *
-        */
-    constructor()
-    {
-        const me = this;
-
-        /**
-                * Translator object
-                * @type Translator
-                */
-        me.transObj = new Translator();
-    }
-
-    /**
-        * fillTrans()
-        *
-        * Check cache for translation, if it doesn't exist, ask Translator object for translation and fill Cache
-        *
-        * @author  Dario Filkovic <dfilkovi@gmail.com>
-        *
-        * @since 1.0
-        *
-        * @package CoreFw
-        *
-        * @return void
-        */
-    async fillTrans()
-    {
-        const me = this;
-
-        me.trans = await me.transObj.getTranslation();
-
-        const data = await me.transObj.getLangDefs();
-        me.langDefs = data.langDefs;
-        me.langCodes = data.langCodes;
-
-        return { error: false, notice: 'Success' };
-    }
-
-    /**
-        * translate()
-        *
-        * Translate variable by key, if key was not found check translation
-        *
-        * @author  Dario Filkovic <dfilkovi@gmail.com>
-        *
-        * @since 1.0
-        *
-        * @package CoreFw
-        *
-        * @param String $key Key for translating
-        * @return String Returns translated key
-        */
-    translate(keyIn, langId)
-    {
-        const me = this;
-        const key = GeneralHandling.safeTrans(keyIn);
-        if (typeof me.trans[langId] !== 'undefined' && typeof me.trans[langId][key] !== 'undefined')
-        {
-            if (me.trans[langId][key] === '')
-            {
-                return `#${key}`;
-            }
-            return me.trans[langId][key];
-        }
-
-        if (key === '')
-        {
-            return '#EMPTYKEY';
-        }
-        me.checkTrans(key);
-        return `#${key}`;
-    }
-
-    /**
-        * _()
-        *
-        * @see translate
-        *
-        * @since 1.0
-        *
-        * @package CoreFw
-        *
-        * @param String $key Key for translating
-        * @return String Returns translated key
-        */
-    _(key)
-    {
-        return this.translate(key);
-    }
-
-    /**
-        * checkTrans()
-        *
-        * Check translation in Translator object,
-        * Translator object should handle insertion to database if key is untranslated
-        *
-        * @author  Dario Filkovic <dfilkovi@gmail.com>
-        *
-        * @since 1.0
-        *
-        * @package CoreFw
-        *
-        * @param mixed[] $key Translation key
-        * @return void
-        */
-    checkTrans(keyIn)
-    {
-        const me = this;
-        const key = GeneralHandling.safeTrans(keyIn);
-        me.transObj.checkTrans({ key });
-    }
-};
+const GeneralHandling = require('./GeneralHandling.js');
+const Translator = require('../objects/Translator.js');
+
+/**
+  * Language class
+  *
+  * module.exports = class providing language methods, translation and language cache filling
+  *
+  * @author  Dario Filkovic <dfilkovi@gmail.com>
+  *
+  * @since 1.0
+  *
+  * @package CoreFw
+  */
+module.exports = class Language
+{
+    /**
+        * constructor()
+        *
+        * Constructor initializing Translator object, Cache and filling language variables
+        *
+        * @author  Dario Filkovic <dfilkovi@gmail.com>
+        *
+        * @since 1.0
+        *
+        * @package CoreFw
+        *
+        */
+    constructor()
+    {
+        const me = this;
+
+        /**
+                * Translator object
+                * @type Translator
+                */
+        me.transObj = new Translator();
+    }
+
+    /**
+        * fillTrans()
+        *
+        * Check cache for translation, if it doesn't exist, ask Translator object for translation and fill Cache
+        *
+        * @author  Dario Filkovic <dfilkovi@gmail.com>
+        *
+        * @since 1.0
+        *
+        * @package CoreFw
+        *
+        * @return void
+        */
+    async fillTrans()
+    {
+        const me = this;
+
+        me.trans = await me.transObj.getTranslation();
+
+        const data = await me.transObj.getLangDefs();
+        me.langDefs = data.langDefs;
+        me.langCodes = data.langCodes;
+
+        return { error: false, notice: 'Success' };
+    }
+
+    /**
+        * translate()
+        *
+        * Translate variable by key, if key was not found check translation
+        *
+        * @author  Dario Filkovic <dfilkovi@gmail.com>
+        *
+        * @since 1.0
+        *
+        * @package CoreFw
+        *
+        * @param String $key Key for translating
+        * @return String Returns translated key
+        */
+    translate(keyIn, langId)
+    {
+        const me = this;
+        const key = GeneralHandling.safeTrans(keyIn);
+        if (typeof me.trans[langId] !== 'undefined' && typeof me.trans[langId][key] !== 'undefined')
+        {
+            if (me.trans[langId][key] === '')
+            {
+                return `#${key}`;
+            }
+            return me.trans[langId][key];
+        }
+
+        if (key === '')
+        {
+            return '#EMPTYKEY';
+        }
+        me.checkTrans(key);
+        return `#${key}`;
+    }
+
+    /**
+        * _()
+        *
+        * @see translate
+        *
+        * @since 1.0
+        *
+        * @package CoreFw
+        *
+        * @param String $key Key for translating
+        * @return String Returns translated key
+        */
+    _(key)
+    {
+        return this.translate(key);
+    }
+
+    /**
+        * checkTrans()
+        *
+        * Check translation in Translator object,
+        * Translator object should handle insertion to database if key is untranslated
+        *
+        * @author  Dario Filkovic <dfilkovi@gmail.com>
+        *
+        * @since 1.0
+        *
+        * @package CoreFw
+        *
+        * @param mixed[] $key Translation key
+        * @return void
+        */
+    checkTrans(keyIn)
+    {
+        const me = this;
+        const key = GeneralHandling.safeTrans(keyIn);
+        me.transObj.checkTrans({ key });
+    }
+};

package/lib/MySql.js

@@ -1,142 +1,141 @@
-
-const mysql = require('promise-mysql');
-const SqlString = require('sqlstring');
-const CoreError = require('./errors/CoreError');
-const SQLError = require('./errors/SQLError');
-
-module.exports = class MySQLConn
-{
-    static async init(config)
-    {
-        try
-        {
-            const db = await mysql.createPool(
-                {
-                    connectionLimit: config.connectionLimit,
-                    host: config.host,
-                    user: config.username,
-                    password: config.password,
-                    database: config.dbname,
-                    port: config.port,
-                    dateStrings: true, // if we want dates as strings
-                    connectTimeout: 20000,
-                    acquireTimeout: 20000,
-                    queryFormat(query, values)
-                    {
-                        let data = query;
-                        if (!values)
-                        {
-                            data = query;
-                        }
-                        else
-                        if (query.indexOf('?') !== -1)
-                        {
-                            data = SqlString.format(query, values, this.config.stringifyObjects, this.config.timezone);
-                        }
-                        else
-                        {
-                            data = query.replace(/:(\w+)/g, (txt, key) =>
-                            {
-                                if (Object.prototype.hasOwnProperty.call(values, key))
-                                {
-                                    return this.escape(values[key]);
-                                }
-                                return txt;
-                            });
-                        }
-                        console.log(data, `connected as id ${this.threadId}`);
-                        return data;
-                    },
-                },
-            );
-
-            db.dbname = config.dbname;
-
-            db.query = async function query(...args)
-            {
-                const me = this;
-                try
-                {
-                    const res = await Object.getPrototypeOf(me).query.call(me, ...args);
-                    return res;
-                }
-                catch (e)
-                {
-                    throw (new SQLError(e));
-                }
-            };
-
-            db.begin = async (session) =>
-            {
-                if (typeof session === 'undefined')
-                {
-                    throw (new CoreError({
-                        error: true,
-                        notice: 'begin excepts session',
-                    }));
-                }
-
-                const connection = await db.getConnection();
-
-                connection.commitInstance = 0;
-
-                connection.dbname = db.dbname;
-                connection.query = db.query;
-
-                session.tranDb = connection;
-
-                connection.begin = () =>
-                {
-                    // dummy function, as begin was already called and
-                    // mysql does not support nested transactions, return existing connection
-                    connection.commitInstance += 1;
-                    return connection;
-                };
-
-                connection.rollback = async () =>
-                {
-                    if (connection.commitInstance > 0)
-                    {
-                        connection.commitInstance -= 1;
-                        return db;
-                    }
-                    await connection.query('ROLLBACK');
-                    try
-                    {
-                        connection.release();
-                    }
-                    catch (error)
-                    {
-                        // ignore already released connections
-                    }
-                    session.tranDb = null;
-                    return db;
-                };
-
-                connection.commit = async () =>
-                {
-                    if (connection.commitInstance > 0)
-                    {
-                        connection.commitInstance -= 1;
-                        return db;
-                    }
-                    await connection.query('COMMIT');
-                    connection.release();
-                    session.tranDb = null;
-                    return db;
-                };
-
-                await connection.query('START TRANSACTION');
-
-                return connection;
-            };
-
-            return db;
-        }
-        catch (error)
-        {
-            console.error(error);
-            return null;
-        }
-    }
-};
+
+const mysql = require('mysql2/promise');
+const SqlString = require('sqlstring');
+const CoreError = require('./errors/CoreError');
+const SQLError = require('./errors/SQLError');
+
+module.exports = class MySQLConn
+{
+    static async init(config)
+    {
+        try
+        {
+            const db = await mysql.createPool(
+                {
+                    connectionLimit: config.connectionLimit,
+                    host: config.host,
+                    user: config.username,
+                    password: config.password,
+                    database: config.dbname,
+                    port: config.port,
+                    dateStrings: true, // if we want dates as strings
+                    connectTimeout: 20000,
+                    queryFormat(query, values)
+                    {
+                        let data = query;
+                        if (!values)
+                        {
+                            data = query;
+                        }
+                        else
+                        if (query.indexOf('?') !== -1)
+                        {
+                            data = SqlString.format(query, values, this.config.stringifyObjects, this.config.timezone);
+                        }
+                        else
+                        {
+                            data = query.replace(/:(\w+)/g, (txt, key) =>
+                            {
+                                if (Object.prototype.hasOwnProperty.call(values, key))
+                                {
+                                    return this.escape(values[key]);
+                                }
+                                return txt;
+                            });
+                        }
+                        console.log(data, `connected as id ${this.threadId}`);
+                        return data;
+                    },
+                },
+            );
+
+            db.dbname = config.dbname;
+
+            db.query = async function query(...args)
+            {
+                const me = this;
+                try
+                {
+                    const res = await Object.getPrototypeOf(me).query.call(me, ...args);
+                    return res[0];
+                }
+                catch (e)
+                {
+                    throw (new SQLError(e));
+                }
+            };
+
+            db.begin = async (session) =>
+            {
+                if (typeof session === 'undefined')
+                {
+                    throw (new CoreError({
+                        error: true,
+                        notice: 'begin excepts session',
+                    }));
+                }
+
+                const connection = await db.getConnection();
+
+                connection.commitInstance = 0;
+
+                connection.dbname = db.dbname;
+                connection.query = db.query;
+
+                session.tranDb = connection;
+
+                connection.begin = () =>
+                {
+                    // dummy function, as begin was already called and
+                    // mysql does not support nested transactions, return existing connection
+                    connection.commitInstance += 1;
+                    return connection;
+                };
+
+                connection.rollback = async () =>
+                {
+                    if (connection.commitInstance > 0)
+                    {
+                        connection.commitInstance -= 1;
+                        return db;
+                    }
+                    await connection.query('ROLLBACK');
+                    try
+                    {
+                        connection.release();
+                    }
+                    catch (error)
+                    {
+                        // ignore already released connections
+                    }
+                    session.tranDb = null;
+                    return db;
+                };
+
+                connection.commit = async () =>
+                {
+                    if (connection.commitInstance > 0)
+                    {
+                        connection.commitInstance -= 1;
+                        return db;
+                    }
+                    await connection.query('COMMIT');
+                    connection.release();
+                    session.tranDb = null;
+                    return db;
+                };
+
+                await connection.query('START TRANSACTION');
+
+                return connection;
+            };
+
+            return db;
+        }
+        catch (error)
+        {
+            console.error(error);
+            return null;
+        }
+    }
+};