refactor: error handling

Add boolean to disable throwing error for query.
Reject promises when using _async exports.
Return errors as strings instead of Error (fails to serialise).

Fixes #122

Author: thelindat

src/database/rawExecute.ts

@@ -10,7 +10,8 @@ export const rawExecute = async (
   invokingResource: string,
   query: string,
   parameters: CFXParameters,
-  cb?: CFXCallback
+  cb?: CFXCallback,
+  throwError?: boolean
 ) => {
   const type = executeType(query);
   parameters = parseExecute(parameters);
@@ -45,9 +46,12 @@ export const rawExecute = async (
 
     single = response.length === 1;
   } catch (err: any) {
-    throw new Error(`${invokingResource} was unable to execute a query!
-	${err.message}
-	${err.sql}`);
+    const error = `${invokingResource} was unable to execute a query!
+    ${err.message}
+    ${err.sql}`;
+
+    if (cb) cb(null, error)
+    if (throwError) throw new Error(error)
   } finally {
     connection.release();
   }

src/database/rawQuery.ts

@@ -11,7 +11,8 @@ export const rawQuery = async (
   invokingResource: string,
   query: string,
   parameters: CFXParameters,
-  cb?: CFXCallback
+  cb?: CFXCallback,
+  throwError?: boolean
 ) => {
   await scheduleTick();
   [query, parameters, cb] = parseArguments(invokingResource, query, parameters, cb);
@@ -27,8 +28,9 @@ export const rawQuery = async (
       } catch (err) {}
     });
   }).catch((err) => {
-    throw new Error(
-      `${invokingResource} was unable to execute a query!\n${err.message}\n${`${query} ${JSON.stringify(parameters)}`}`
-    );
+    const error = `${invokingResource} was unable to execute a query!\n${err.message}\n${`${query} ${JSON.stringify(parameters)}`}`
+
+    if (cb) cb(null, error)
+    if (throwError) throw new Error(error)
   });
 };

src/index.ts

@@ -6,44 +6,54 @@ import('./update');
 
 const MySQL = {} as Record<string, Function>;
 
-MySQL.query = (query: string, parameters: CFXParameters, cb: CFXCallback, invokingResource = GetInvokingResource()) => {
-  rawQuery(null, invokingResource, query, parameters, cb);
+MySQL.query = (
+  query: string,
+  parameters: CFXParameters,
+  cb: CFXCallback,
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
+) => {
+  rawQuery(null, invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.single = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
-  invokingResource = GetInvokingResource()
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
 ) => {
-  rawQuery('single', invokingResource, query, parameters, cb);
+  rawQuery('single', invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.scalar = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
-  invokingResource = GetInvokingResource()
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
 ) => {
-  rawQuery('scalar', invokingResource, query, parameters, cb);
+  rawQuery('scalar', invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.update = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
-  invokingResource = GetInvokingResource()
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
 ) => {
-  rawQuery('update', invokingResource, query, parameters, cb);
+  rawQuery('update', invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.insert = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
-  invokingResource = GetInvokingResource()
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
 ) => {
-  rawQuery('insert', invokingResource, query, parameters, cb);
+  rawQuery('insert', invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.transaction = (
@@ -59,9 +69,10 @@ MySQL.prepare = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
-  invokingResource = GetInvokingResource()
+  invokingResource = GetInvokingResource(),
+  throwError?: boolean
 ) => {
-  rawExecute(invokingResource, query, parameters, cb);
+  rawExecute(invokingResource, query, parameters, cb, throwError);
 };
 
 MySQL.execute = MySQL.query;
@@ -71,8 +82,17 @@ for (const key in MySQL) {
   global.exports(key, MySQL[key]);
 
   const exp = (query: string, parameters: CFXParameters, invokingResource = GetInvokingResource()) => {
-    return new Promise((resolve) => {
-      MySQL[key](query, parameters, resolve, invokingResource);
+    return new Promise((resolve, reject) => {
+      MySQL[key](
+        query,
+        parameters,
+        (result: unknown, err: string) => {
+          if (err) return reject(new Error(err));
+          resolve(result);
+        },
+        invokingResource,
+        true
+      );
     });
   };
 

src/types/index.ts

@@ -15,4 +15,4 @@ export type TransactionQuery = {
 // working with this type is impossible but at least we can pretend to be strictly typed
 export type CFXParameters = any[];
 
-export type CFXCallback = (result: QueryResponse | number | null) => void;
+export type CFXCallback = (result: QueryResponse | number | null, err?: string) => void;