fix(query): less verbose errors

Author: thelindat

fxmanifest.lua

@@ -3,7 +3,7 @@ game 'common'
 
 name 'oxmysql'
 description 'Database wrapper for FiveM utilising node-mysql2 offering improved performance and security.'
-version '2.2.1'
+version '2.2.2'
 url 'https://github.com/overextended/oxmysql'
 author 'overextended'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxmysql",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "FXServer to MySQL communication via node-mysql2",
   "repository": "[email protected]:overextended/oxmysql.git",
   "author": "dunak-debug <[email protected]>",

src/database/index.ts

@@ -8,6 +8,7 @@ let serverReady = false;
 setTimeout(() => {
   pool = createPool({
     connectTimeout: 60000,
+    trace: false,
     ...connectionOptions,
     typeCast,
   });

src/database/rawQuery.ts

@@ -16,18 +16,16 @@ export const rawQuery = async (
   await scheduleTick();
   [query, parameters, cb] = parseArguments(invokingResource, query, parameters, cb);
 
-  //@ts-ignore TODO: patch mysql2 type
-  pool.query(query, parameters, (err, result, _, executionTime) => {
-    logQuery(invokingResource, query, executionTime, parameters);
-    if (err)
-      throw new Error(
-        `${invokingResource} was unable to execute a query!\n${err.message}\n${`${query} ${JSON.stringify(
-          parameters
-        )}`}`
-      );
+  return await new Promise((resolve, reject) => {
+    pool.query(query, parameters, (err, result, _, executionTime) => {
+      if (err) return reject(err);
 
-    if (cb) {
-      cb(parseResponse(type, result));
-    }
+      logQuery(invokingResource, query, executionTime, parameters);
+      resolve(cb ? cb(parseResponse(type, result)) : null);
+    });
+  }).catch((err) => {
+    throw new Error(
+      `${invokingResource} was unable to execute a query!\n${err.message}\n${`${query} ${JSON.stringify(parameters)}`}`
+    );
   });
 };