From d80d876ac12d8442cf2aaa7f1ce563e05daacb09 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Sat, 5 Jul 2025 16:53:58 +0100
Subject: [PATCH] Updates

---
 .../functions/api/query-dsql-api.js           | 20 +++++++---
 dist/package-shared/types/index.d.ts          |  1 +
 .../functions/api/query-dsql-api.ts           | 38 ++++++++++++-------
 package-shared/types/index.ts                 |  1 +
 package.json                                  |  2 +-
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/dist/package-shared/functions/api/query-dsql-api.js b/dist/package-shared/functions/api/query-dsql-api.js
index 1994efd..4298f7a 100644
--- a/dist/package-shared/functions/api/query-dsql-api.js
+++ b/dist/package-shared/functions/api/query-dsql-api.js
@@ -48,13 +48,14 @@ function queryDSQLAPI(_a) {
                     const queryString = (0, serialize_query_1.default)(query);
                     finalPath += `${queryString}`;
                 }
-                const httpsRequest = scheme.request({
+                const requestOptions = {
                     method: method || "GET",
                     headers,
                     port,
                     hostname: host,
                     path: finalPath,
-                }, 
+                };
+                const httpsRequest = scheme.request(requestOptions, 
                 /**
                  * Callback Function
                  *
@@ -73,7 +74,9 @@ function queryDSQLAPI(_a) {
                             resolve({
                                 success: false,
                                 payload: undefined,
-                                msg: error.message,
+                                msg: `An error occurred while parsing the response`,
+                                error: error.message,
+                                errorData: requestOptions,
                             });
                         }
                     });
@@ -81,7 +84,9 @@ function queryDSQLAPI(_a) {
                         resolve({
                             success: false,
                             payload: undefined,
-                            msg: err.message,
+                            msg: `An error occurred on the response`,
+                            error: err.message,
+                            errorData: requestOptions,
                         });
                     });
                 });
@@ -89,7 +94,9 @@ function queryDSQLAPI(_a) {
                     resolve({
                         success: false,
                         payload: undefined,
-                        msg: err.message,
+                        msg: `An error occurred while making the request`,
+                        error: err.message,
+                        errorData: requestOptions,
                     });
                 });
                 if (reqPayload) {
@@ -103,7 +110,8 @@ function queryDSQLAPI(_a) {
             return {
                 success: false,
                 payload: undefined,
-                msg: error.message,
+                msg: `Request Failed`,
+                error: error.message,
             };
         }
     });
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index 4d06b9b..2938627 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -1389,6 +1389,7 @@ export type APIResponseObject<T extends any = any> = {
     errors?: DSQLErrorObject[];
     debug?: any;
     batchPayload?: any[][] | null;
+    errorData?: any;
 };
 export declare const UserTypes: readonly ["su", "admin"];
 export declare const SignUpParadigms: readonly [{
diff --git a/package-shared/functions/api/query-dsql-api.ts b/package-shared/functions/api/query-dsql-api.ts
index eacbaae..830157a 100644
--- a/package-shared/functions/api/query-dsql-api.ts
+++ b/package-shared/functions/api/query-dsql-api.ts
@@ -8,6 +8,7 @@ import {
 } from "../../types";
 import grabHostNames from "../../utils/grab-host-names";
 import serializeQuery from "../../utils/serialize-query";
+import { RequestOptions } from "https";
 
 type Param<T = { [k: string]: any }> = {
     body?: T;
@@ -68,14 +69,16 @@ export default async function queryDSQLAPI<
                 finalPath += `${queryString}`;
             }
 
+            const requestOptions: RequestOptions = {
+                method: method || "GET",
+                headers,
+                port,
+                hostname: host,
+                path: finalPath,
+            };
+
             const httpsRequest = scheme.request(
-                {
-                    method: method || "GET",
-                    headers,
-                    port,
-                    hostname: host,
-                    path: finalPath,
-                },
+                requestOptions,
 
                 /**
                  * Callback Function
@@ -96,8 +99,10 @@ export default async function queryDSQLAPI<
                             resolve({
                                 success: false,
                                 payload: undefined,
-                                msg: error.message,
-                            });
+                                msg: `An error occurred while parsing the response`,
+                                error: error.message,
+                                errorData: requestOptions,
+                            } as APIResponseObject);
                         }
                     });
 
@@ -105,8 +110,10 @@ export default async function queryDSQLAPI<
                         resolve({
                             success: false,
                             payload: undefined,
-                            msg: err.message,
-                        });
+                            msg: `An error occurred on the response`,
+                            error: err.message,
+                            errorData: requestOptions,
+                        } as APIResponseObject);
                     });
                 }
             );
@@ -115,8 +122,10 @@ export default async function queryDSQLAPI<
                 resolve({
                     success: false,
                     payload: undefined,
-                    msg: err.message,
-                });
+                    msg: `An error occurred while making the request`,
+                    error: err.message,
+                    errorData: requestOptions,
+                } as APIResponseObject);
             });
 
             if (reqPayload) {
@@ -130,7 +139,8 @@ export default async function queryDSQLAPI<
         return {
             success: false,
             payload: undefined,
-            msg: error.message,
+            msg: `Request Failed`,
+            error: error.message,
         };
     }
 }
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index ea1ee09..198f545 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -1608,6 +1608,7 @@ export type APIResponseObject<T extends any = any> = {
     errors?: DSQLErrorObject[];
     debug?: any;
     batchPayload?: any[][] | null;
+    errorData?: any;
 };
 
 export const UserTypes = ["su", "admin"] as const;
diff --git a/package.json b/package.json
index 21e20ca..2f067b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "4.8.2",
+    "version": "4.8.3",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {