updates

2026-07-14 09:10:30 +01:00
parent 79c5b896fe
commit 56462e6cc2
38 changed files with 1056 additions and 1720 deletions
@@ -1,66 +1,86 @@
-import grabMariaDBClient from "../functions/grab-mariadb-client";
-import type {
-    BunMariaDBConfig,
-    DBInsertReturn,
-    DBResponseObject,
-} from "../types";
-
-type Param = {
-    query: string;
-    values?: any[];
-    config?: BunMariaDBConfig;
-};
-
-/**
- * # Main DB Handler Function
- * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
- */
-export default async function dbHandler<
-    T extends { [k: string]: any } = { [k: string]: any },
->({ query, values, config }: Param): Promise<DBResponseObject<T>> {
-    try {
-        const CLIENT = config
-            ? grabMariaDBClient({ config })
-            : global.MARIADB_CLIENT;
-
-        if (!CLIENT) {
-            throw new Error(`Couldn't grab MariaDB Client.`);
-        }
-
-        const res = await CLIENT.unsafe(query, values);
-
-        const count = res.count;
-
-        const res_array = (() => {
-            try {
-                return JSON.parse(JSON.stringify(res)) as T[];
-            } catch (error) {
-                return undefined;
-            }
-        })();
-
-        const last_insert_id = res_array?.[0] ? res_array[0]?.id : undefined;
-        const affected_rows = res_array?.[0] ? res_array.length : undefined;
-
-        const insert_return: DBInsertReturn = {
-            count,
-            last_insert_id,
-            affected_rows,
-        };
-
-        return {
-            success: true,
-            payload: res_array,
-            single_res: res_array?.[0],
-            insert_return,
-            count,
-        };
-    } catch (error: any) {
-        return {
-            success: false,
-            error: "DB Handler Error => " + error.message,
-            msg: "DB Handler Error => " + error.message,
-        };
-    } finally {
-    }
-}
+import grabMariaDBClient from "../functions/grab-mariadb-client";
+import type {
+    BunMariaDBConfig,
+    DBInsertReturn,
+    DBResponseObject,
+} from "../types";
+
+type Param = {
+    query: string;
+    values?: any[];
+    config?: BunMariaDBConfig;
+};
+
+/**
+ * Resolve a shared MariaDB client. Prefer the global client so schema sync
+ * and CRUD do not open a new connection per query.
+ */
+function resolveClient(config?: BunMariaDBConfig): Bun.SQL | undefined {
+    const resolvedConfig = config || global.CONFIG;
+
+    // Same database as the global client → reuse it
+    if (
+        global.MARIADB_CLIENT &&
+        (!resolvedConfig?.db_name ||
+            !global.CONFIG?.db_name ||
+            resolvedConfig.db_name === global.CONFIG.db_name)
+    ) {
+        return global.MARIADB_CLIENT;
+    }
+
+    if (resolvedConfig) {
+        return grabMariaDBClient({ config: resolvedConfig });
+    }
+
+    return global.MARIADB_CLIENT;
+}
+
+/**
+ * # Main DB Handler Function
+ */
+export default async function dbHandler<
+    T extends { [k: string]: any } = { [k: string]: any },
+>({ query, values, config }: Param): Promise<DBResponseObject<T>> {
+    try {
+        const CLIENT = resolveClient(config);
+
+        if (!CLIENT) {
+            throw new Error(`Couldn't grab MariaDB Client.`);
+        }
+
+        const res = await CLIENT.unsafe(query, values);
+
+        const count = res.count;
+
+        const res_array = (() => {
+            try {
+                return JSON.parse(JSON.stringify(res)) as T[];
+            } catch (error) {
+                return undefined;
+            }
+        })();
+
+        const last_insert_id = res_array?.[0] ? res_array[0]?.id : undefined;
+        const affected_rows = res_array?.[0] ? res_array.length : undefined;
+
+        const insert_return: DBInsertReturn = {
+            count,
+            last_insert_id,
+            affected_rows,
+        };
+
+        return {
+            success: true,
+            payload: res_array,
+            single_res: res_array?.[0],
+            insert_return,
+            count,
+        };
+    } catch (error: any) {
+        return {
+            success: false,
+            error: "DB Handler Error => " + error.message,
+            msg: "DB Handler Error => " + error.message,
+        };
+    }
+}