From 0e5b5fea6ecda6e7e8614fcb033e8916dddd7bd2 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Fri, 26 Dec 2025 09:37:33 +0100
Subject: [PATCH] Updates

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

diff --git a/dist/package-shared/functions/api/query-dsql-api.js b/dist/package-shared/functions/api/query-dsql-api.js
index 4f49bfc..63ee12f 100644
--- a/dist/package-shared/functions/api/query-dsql-api.js
+++ b/dist/package-shared/functions/api/query-dsql-api.js
@@ -31,6 +31,7 @@ function queryDSQLAPI(_a) {
                 : undefined) ||
             process.env.DSQL_FULL_ACCESS_API_KEY ||
             process.env.DSQL_API_KEY;
+        let requestOptions;
         try {
             /**
              * Make https request
@@ -51,7 +52,7 @@ function queryDSQLAPI(_a) {
                     const queryString = (0, serialize_query_1.default)(query);
                     finalPath += `${queryString}`;
                 }
-                const requestOptions = {
+                requestOptions = {
                     method: method || "GET",
                     headers,
                     port,
@@ -83,7 +84,7 @@ function queryDSQLAPI(_a) {
                                 //     httpsRequest.getHeaders()
                                 // );
                             }
-                            resolve(responseObj);
+                            resolve(Object.assign(Object.assign({}, responseObj), { requestOptions }));
                         }
                         catch (error) {
                             resolve({
@@ -107,6 +108,7 @@ function queryDSQLAPI(_a) {
                             msg: `An error occurred on the response`,
                             error: err.message,
                             errorData: { requestOptions, grabedHostNames },
+                            requestOptions,
                         });
                     });
                 });
@@ -120,6 +122,7 @@ function queryDSQLAPI(_a) {
                             requestOptions,
                             grabedHostNames: lodash_1.default.omit(grabedHostNames, ["scheme"]),
                         },
+                        requestOptions,
                     });
                 });
                 if (reqPayload) {
@@ -135,6 +138,7 @@ function queryDSQLAPI(_a) {
                 singleRes: undefined,
                 msg: `Request Failed`,
                 error: error.message,
+                requestOptions,
             };
         }
     });
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index 3fefa39..067a71b 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -1477,6 +1477,7 @@ export type APIResponseObject<T extends {
     code?: string;
     createdAt?: number;
     email?: string;
+    requestOptions?: RequestOptions;
 };
 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 d658c8e..5d2bee0 100644
--- a/package-shared/functions/api/query-dsql-api.ts
+++ b/package-shared/functions/api/query-dsql-api.ts
@@ -53,6 +53,8 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
         process.env.DSQL_FULL_ACCESS_API_KEY ||
         process.env.DSQL_API_KEY;
 
+    let requestOptions: RequestOptions | undefined;
+
     try {
         /**
          * Make https request
@@ -78,7 +80,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                 finalPath += `${queryString}`;
             }
 
-            const requestOptions: RequestOptions = {
+            requestOptions = {
                 method: method || "GET",
                 headers,
                 port,
@@ -106,6 +108,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                             const responseObj = JSON.parse(
                                 str
                             ) as APIResponseObject;
+
                             if (!responseObj.success) {
                                 // console.log("responseObj", responseObj);
                                 // console.log(
@@ -117,7 +120,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                                 //     httpsRequest.getHeaders()
                                 // );
                             }
-                            resolve(responseObj);
+                            resolve({ ...responseObj, requestOptions });
                         } catch (error: any) {
                             resolve({
                                 success: false,
@@ -141,6 +144,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                             msg: `An error occurred on the response`,
                             error: err.message,
                             errorData: { requestOptions, grabedHostNames },
+                            requestOptions,
                         } as APIResponseObject);
                     });
                 }
@@ -156,6 +160,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                         requestOptions,
                         grabedHostNames: _.omit(grabedHostNames, ["scheme"]),
                     },
+                    requestOptions,
                 } as APIResponseObject);
             });
 
@@ -172,6 +177,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
             singleRes: undefined,
             msg: `Request Failed`,
             error: error.message,
+            requestOptions,
         };
     }
 }
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index 39f1e7c..0923ddf 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -1712,6 +1712,7 @@ export type APIResponseObject<
     code?: string;
     createdAt?: number;
     email?: string;
+    requestOptions?: RequestOptions;
 };
 
 export const UserTypes = ["su", "admin"] as const;
diff --git a/package.json b/package.json
index 8e2d6a4..323708c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.5.9",
+    "version": "5.6.0",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {