@dyrected/db-mysql 2.13.0 → 2.13.3

package/LICENSE.md

@@ -0,0 +1,50 @@
+Business Source License 1.1
+
+Parameters
+
+Licensor: Dyrected
+Licensed Work: Dyrected
+Additional Use Grant: Production use and commercial use of the Licensed Work are permitted for your own internal business operations, your own websites and applications, and client websites or applications that you build or deploy on behalf of a client, provided that you do not, without a separate commercial license from the Licensor, (a) provide the Licensed Work as a hosted or managed service to third parties, (b) embed, white-label, sublicense, or otherwise redistribute the Licensed Work as part of a multi-tenant or customer-facing SaaS, platform, or developer service, or (c) enable third parties to create, manage, or operate independent projects, sites, workspaces, or environments using the Licensed Work as a material part of the service you provide.
+Change Date: 2030-05-18
+Change License: Apache License 2.0
+
+---
+
+Business Source License 1.1
+
+License text copyright © 2024 MariaDB plc, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB plc.
+
+### Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+
+If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license your works, and to refer to it using the trademark “Business Source License”, as long as you comply with the Covenants of Licensor below.
+
+### Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business Source License” name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where “compatible” means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text “None”.
+
+3. Not to modify this License in any other way.
+
+---
+
+The Business Source License (this document, or the “License”) is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.

package/dist/index.cjs

@@ -31,11 +31,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   MysqlAdapter: () => MysqlAdapter,
+  closeAllMysqlClients: () => closeAllMysqlClients,
   mysqlAdapter: () => mysqlAdapter
 });
 module.exports = __toCommonJS(index_exports);
 var import_core = require("@dyrected/core");
 var import_promise = __toESM(require("mysql2/promise"), 1);
+var MYSQL_CLIENT_CACHE_KEY = "__dyrectedMysqlClientCache";
+function getSharedMysqlClientCache() {
+  const globalScope = globalThis;
+  if (!globalScope[MYSQL_CLIENT_CACHE_KEY]) {
+    globalScope[MYSQL_CLIENT_CACHE_KEY] = /* @__PURE__ */ new Map();
+  }
+  return globalScope[MYSQL_CLIENT_CACHE_KEY];
+}
+function getMysqlCacheKey(config) {
+  if (config.url) return config.url;
+  return `${config.host || "localhost"}:${config.port || 3306}:${config.database || ""}:${config.user || ""}`;
+}
 function escapeMysqlIdentifier(identifier) {
   return `\`${identifier.replace(/`/g, "``")}\``;
 }
@@ -54,6 +67,9 @@ var MysqlAdapter = class {
   config;
   initPromise = null;
   inTransaction = false;
+  tableLocks = /* @__PURE__ */ new Map();
+  ensuredTables = /* @__PURE__ */ new Set();
+  tableColumnsCache = /* @__PURE__ */ new Map();
   constructor(config) {
     this.config = config;
   }
@@ -76,6 +92,25 @@ FIX INSTRUCTIONS:
     }
     throw err;
   }
+  async retryOperation(operation, maxRetries = 3, initialDelay = 1e3) {
+    let lastError;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        return await operation();
+      } catch (err) {
+        lastError = err;
+        const isNetworkOrTimeout = err.code === "ETIMEDOUT" || err.code === "ECONNREFUSED" || err.code === "PROTOCOL_CONNECTION_LOST" || err.message?.includes("ETIMEDOUT") || err.message?.includes("Connection lost");
+        if (attempt < maxRetries && isNetworkOrTimeout) {
+          const delay = initialDelay * Math.pow(2, attempt - 1);
+          console.warn(`[dyrected/db-mysql] Connection attempt ${attempt} failed (${err.code || err.message}), retrying in ${delay}ms...`);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        } else {
+          break;
+        }
+      }
+    }
+    throw lastError;
+  }
   async ensureInitialized() {
     if (!this.initPromise) {
       this.initPromise = this.initialize();
@@ -83,59 +118,126 @@ FIX INSTRUCTIONS:
     await this.initPromise;
   }
   async initialize() {
-    const config = this.config;
-    let dbName = config.database;
-    let serverConfig = null;
-    if (config.url) {
-      try {
-        const parsed = new URL(config.url);
-        dbName = parsed.pathname.replace(/^\//, "");
-        const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
-        serverConfig = serverUrl;
-      } catch (err) {
+    const cache = getSharedMysqlClientCache();
+    const cacheKey = getMysqlCacheKey(this.config);
+    const cached = cache.get(cacheKey);
+    if (cached?.pool) {
+      this.pool = cached.pool;
+      return;
+    }
+    if (cached?.initPromise) {
+      this.pool = await cached.initPromise;
+      return;
+    }
+    const initPromise = (async () => {
+      const config = this.config;
+      let dbName = config.database;
+      let serverConfig = null;
+      if (config.url) {
+        try {
+          const parsed = new URL(config.url);
+          dbName = parsed.pathname.replace(/^\//, "");
+          const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
+          serverConfig = serverUrl;
+        } catch (err) {
+        }
+      } else {
+        serverConfig = {
+          host: config.host ?? "localhost",
+          port: config.port ?? 3306,
+          user: config.user,
+          password: config.password
+        };
       }
-    } else {
-      serverConfig = {
-        host: config.host ?? "localhost",
-        port: config.port ?? 3306,
-        user: config.user,
-        password: config.password
+      if (dbName && serverConfig) {
+        try {
+          await this.retryOperation(async () => {
+            const tempConn = await import_promise.default.createConnection(serverConfig);
+            try {
+              await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
+            } finally {
+              await tempConn.end().catch(() => {
+              });
+            }
+          }, 3, 1e3);
+          console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+        } catch (err) {
+          console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
+          if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+            this.handleConnectionError(err);
+          }
+        }
+      }
+      const defaultPoolOptions = {
+        enableKeepAlive: true,
+        keepAliveInitialDelay: 1e4,
+        connectTimeout: 2e4,
+        dateStrings: true,
+        waitForConnections: true,
+        connectionLimit: 10,
+        queueLimit: 0,
+        ...config.poolOptions
       };
-    }
-    if (dbName && serverConfig) {
+      let pool;
+      if (config.url) {
+        pool = import_promise.default.createPool({
+          uri: config.url,
+          ...defaultPoolOptions
+        });
+      } else {
+        pool = import_promise.default.createPool({
+          host: config.host ?? "localhost",
+          port: config.port ?? 3306,
+          user: config.user,
+          password: config.password,
+          database: config.database,
+          ...defaultPoolOptions
+        });
+      }
       try {
-        const tempConn = await import_promise.default.createConnection(serverConfig);
-        await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
-        await tempConn.end();
-        console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+        await this.retryOperation(async () => {
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS dyrected_internal (
+              \`key\` VARCHAR(255) PRIMARY KEY,
+              value JSON NOT NULL
+            )
+          `);
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS _dyrected_ai_threads (
+              id VARCHAR(36) PRIMARY KEY,
+              project_id VARCHAR(255) NOT NULL,
+              user_id VARCHAR(255) NOT NULL,
+              title TEXT,
+              created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+              updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+              INDEX idx_ai_threads_user_project (user_id, project_id)
+            )
+          `);
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS _dyrected_ai_messages (
+              id VARCHAR(36) PRIMARY KEY,
+              thread_id VARCHAR(36) NOT NULL,
+              role VARCHAR(50) NOT NULL,
+              content LONGTEXT NOT NULL,
+              created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+              metadata JSON,
+              INDEX idx_ai_messages_thread_id (thread_id),
+              CONSTRAINT fk_ai_messages_thread FOREIGN KEY (thread_id) REFERENCES _dyrected_ai_threads(id) ON DELETE CASCADE
+            )
+          `);
+        }, 3, 1e3);
       } catch (err) {
-        console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
-        if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
-          this.handleConnectionError(err);
-        }
+        this.handleConnectionError(err);
       }
-    }
-    if (config.url) {
-      this.pool = import_promise.default.createPool(config.url);
-    } else {
-      this.pool = import_promise.default.createPool({
-        host: config.host ?? "localhost",
-        port: config.port ?? 3306,
-        user: config.user,
-        password: config.password,
-        database: config.database,
-        dateStrings: true
-      });
-    }
+      return pool;
+    })();
+    cache.set(cacheKey, { initPromise });
     try {
-      await this.pool.query(`
-        CREATE TABLE IF NOT EXISTS dyrected_internal (
-          \`key\` VARCHAR(255) PRIMARY KEY,
-          value JSON NOT NULL
-        )
-      `);
-    } catch (err) {
-      this.handleConnectionError(err);
+      this.pool = await initPromise;
+      cache.set(cacheKey, { pool: this.pool });
+    } catch (error) {
+      cache.delete(cacheKey);
+      throw error;
     }
   }
   async query(sql, params) {
@@ -155,28 +257,92 @@ FIX INSTRUCTIONS:
     }
   }
   getTableName(slug) {
-    return `collection_${slug}`;
+    if (slug.includes(".")) {
+      const parts = slug.split(".");
+      return parts[parts.length - 1].replace(/`/g, "");
+    }
+    return slug.startsWith("collection_") ? slug : `collection_${slug}`;
   }
-  async ensureTable(slug, fields = []) {
-    const tableName = this.getTableName(slug);
-    await this.query(`
-      CREATE TABLE IF NOT EXISTS \`${tableName}\` (
-        id VARCHAR(36) PRIMARY KEY,
-        data JSON NOT NULL,
-        created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
-        updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
-      )
-    `);
+  async getTableColumns(tableName) {
+    const cached = this.tableColumnsCache.get(tableName);
+    if (cached) return cached;
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
-    for (const field of fields) {
-      if (field.promoted && !existingCols.includes(field.name)) {
-        console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
-        let sqlType = "TEXT";
-        if (field.type === "number") sqlType = "DECIMAL(19,4)";
-        if (field.type === "boolean") sqlType = "TINYINT(1)";
-        await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+    this.tableColumnsCache.set(tableName, existingCols);
+    return existingCols;
+  }
+  async ensureTable(slug, fields = []) {
+    if (slug === "_dyrected_ai_threads" || slug === "_dyrected_ai_messages") {
+      return;
+    }
+    if (fields.length === 0 && this.ensuredTables.has(slug)) {
+      return;
+    }
+    if (this.tableLocks.has(slug)) {
+      await this.tableLocks.get(slug);
+      if (fields.length === 0 && this.ensuredTables.has(slug)) {
+        return;
+      }
+    }
+    let resolveLock;
+    let rejectLock;
+    const lockPromise = new Promise((resolve, reject) => {
+      resolveLock = resolve;
+      rejectLock = reject;
+    });
+    this.tableLocks.set(slug, lockPromise);
+    try {
+      const tableName = this.getTableName(slug);
+      await this.query(`
+        CREATE TABLE IF NOT EXISTS \`${tableName}\` (
+          id VARCHAR(36) PRIMARY KEY,
+          data JSON NOT NULL,
+          created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+          updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
+        )
+      `);
+      const existingCols = await this.getTableColumns(tableName);
+      for (const field of fields) {
+        if (field.promoted && !existingCols.includes(field.name)) {
+          console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
+          let sqlType = "TEXT";
+          if (field.type === "number") sqlType = "DECIMAL(19,4)";
+          if (field.type === "boolean") sqlType = "TINYINT(1)";
+          if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
+          try {
+            await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+            existingCols.push(field.name);
+            this.tableColumnsCache.set(tableName, existingCols);
+          } catch (err) {
+            if (err.code === "ER_DUP_FIELDNAME" || err.errno === 1060 || err.message?.includes("Duplicate column name")) {
+            } else {
+              throw err;
+            }
+          }
+          const escapedField = field.name.replace(/`/g, "``");
+          let castExpr = `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}'))`;
+          if (field.type === "number") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS DECIMAL(19,4)), NULL)`;
+          } else if (field.type === "boolean") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) IN ('true', '1'), 1, 0)`;
+          } else if (field.type === "date" || field.type === "datetime") {
+            castExpr = `STR_TO_DATE(LEFT(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')), 23), '%Y-%m-%d %H:%i:%s.%f')`;
+          }
+          try {
+            await this.query(
+              `UPDATE \`${tableName}\` SET \`${escapedField}\` = ${castExpr} WHERE \`${escapedField}\` IS NULL AND JSON_CONTAINS_PATH(data, 'one', '$.${field.name}')`
+            );
+          } catch {
+          }
+        }
       }
+      this.ensuredTables.add(slug);
+      resolveLock();
+    } catch (err) {
+      rejectLock(err);
+      throw err;
+    } finally {
+      this.tableLocks.delete(slug);
     }
   }
   async find(args) {
@@ -185,8 +351,7 @@ FIX INSTRUCTIONS:
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
     const offset = (page - 1) * limit;
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     let whereSql = "";
     let whereParams = [];
     if (args.where && Object.keys(args.where).length > 0) {
@@ -249,8 +414,7 @@ FIX INSTRUCTIONS:
   async create(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const id = params.data.id ?? Math.random().toString(36).substring(7);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const data = { ...params.data };
@@ -273,8 +437,7 @@ FIX INSTRUCTIONS:
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const merged = { ...existing ?? {}, ...params.data };
@@ -349,8 +512,7 @@ FIX INSTRUCTIONS:
     }
     const tableName = this.getTableName(args.collection);
     if (!this.inTransaction) await this.ensureTable(args.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const toFieldExpr = (field) => {
       if (field === "createdAt") return "`created_at`";
       if (field === "updatedAt") return "`updated_at`";
@@ -443,6 +605,11 @@ FIX INSTRUCTIONS:
     return result;
   }
   async disconnect() {
+    const cache = getSharedMysqlClientCache();
+    const cacheKey = getMysqlCacheKey(this.config);
+    cache.delete(cacheKey);
+    this.ensuredTables.clear();
+    this.tableColumnsCache.clear();
     if (this.initPromise) {
       try {
         await this.initPromise;
@@ -457,9 +624,25 @@ FIX INSTRUCTIONS:
     this.pool = null;
   }
 };
+async function closeAllMysqlClients() {
+  const cache = getSharedMysqlClientCache();
+  const entries = Array.from(cache.values());
+  cache.clear();
+  for (const entry of entries) {
+    try {
+      const pool = entry.pool || await entry.initPromise;
+      if (pool && typeof pool.end === "function") {
+        await pool.end().catch(() => {
+        });
+      }
+    } catch {
+    }
+  }
+}
 var mysqlAdapter = (config) => new MysqlAdapter(config);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MysqlAdapter,
+  closeAllMysqlClients,
   mysqlAdapter
 });

package/dist/index.d.cts

@@ -9,19 +9,26 @@ interface MysqlAdapterConfig {
     user?: string;
     password?: string;
     database?: string;
+    /** Optional pool options passed directly to mysql2 createPool */
+    poolOptions?: Record<string, any>;
 }
 declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
     private config;
     private initPromise;
     private inTransaction;
+    private tableLocks;
+    private ensuredTables;
+    private tableColumnsCache;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
+    private retryOperation;
     private ensureInitialized;
     private initialize;
     private query;
     execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
+    private getTableColumns;
     private ensureTable;
     find(args: {
         collection: string;
@@ -65,6 +72,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<Record<string, any>>;
     disconnect(): Promise<void>;
 }
+declare function closeAllMysqlClients(): Promise<void>;
 declare const mysqlAdapter: (config: MysqlAdapterConfig) => MysqlAdapter;
 
-export { MysqlAdapter, type MysqlAdapterConfig, mysqlAdapter };
+export { MysqlAdapter, type MysqlAdapterConfig, closeAllMysqlClients, mysqlAdapter };

package/dist/index.d.ts

@@ -9,19 +9,26 @@ interface MysqlAdapterConfig {
     user?: string;
     password?: string;
     database?: string;
+    /** Optional pool options passed directly to mysql2 createPool */
+    poolOptions?: Record<string, any>;
 }
 declare class MysqlAdapter implements DatabaseAdapter {
     private pool;
     private config;
     private initPromise;
     private inTransaction;
+    private tableLocks;
+    private ensuredTables;
+    private tableColumnsCache;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
+    private retryOperation;
     private ensureInitialized;
     private initialize;
     private query;
     execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
+    private getTableColumns;
     private ensureTable;
     find(args: {
         collection: string;
@@ -65,6 +72,7 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<Record<string, any>>;
     disconnect(): Promise<void>;
 }
+declare function closeAllMysqlClients(): Promise<void>;
 declare const mysqlAdapter: (config: MysqlAdapterConfig) => MysqlAdapter;
 
-export { MysqlAdapter, type MysqlAdapterConfig, mysqlAdapter };
+export { MysqlAdapter, type MysqlAdapterConfig, closeAllMysqlClients, mysqlAdapter };

package/dist/index.js

@@ -1,6 +1,18 @@
 // src/index.ts
 import { parseSort, parseSqlWhere } from "@dyrected/core";
 import mysql from "mysql2/promise";
+var MYSQL_CLIENT_CACHE_KEY = "__dyrectedMysqlClientCache";
+function getSharedMysqlClientCache() {
+  const globalScope = globalThis;
+  if (!globalScope[MYSQL_CLIENT_CACHE_KEY]) {
+    globalScope[MYSQL_CLIENT_CACHE_KEY] = /* @__PURE__ */ new Map();
+  }
+  return globalScope[MYSQL_CLIENT_CACHE_KEY];
+}
+function getMysqlCacheKey(config) {
+  if (config.url) return config.url;
+  return `${config.host || "localhost"}:${config.port || 3306}:${config.database || ""}:${config.user || ""}`;
+}
 function escapeMysqlIdentifier(identifier) {
   return `\`${identifier.replace(/`/g, "``")}\``;
 }
@@ -19,6 +31,9 @@ var MysqlAdapter = class {
   config;
   initPromise = null;
   inTransaction = false;
+  tableLocks = /* @__PURE__ */ new Map();
+  ensuredTables = /* @__PURE__ */ new Set();
+  tableColumnsCache = /* @__PURE__ */ new Map();
   constructor(config) {
     this.config = config;
   }
@@ -41,6 +56,25 @@ FIX INSTRUCTIONS:
     }
     throw err;
   }
+  async retryOperation(operation, maxRetries = 3, initialDelay = 1e3) {
+    let lastError;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        return await operation();
+      } catch (err) {
+        lastError = err;
+        const isNetworkOrTimeout = err.code === "ETIMEDOUT" || err.code === "ECONNREFUSED" || err.code === "PROTOCOL_CONNECTION_LOST" || err.message?.includes("ETIMEDOUT") || err.message?.includes("Connection lost");
+        if (attempt < maxRetries && isNetworkOrTimeout) {
+          const delay = initialDelay * Math.pow(2, attempt - 1);
+          console.warn(`[dyrected/db-mysql] Connection attempt ${attempt} failed (${err.code || err.message}), retrying in ${delay}ms...`);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        } else {
+          break;
+        }
+      }
+    }
+    throw lastError;
+  }
   async ensureInitialized() {
     if (!this.initPromise) {
       this.initPromise = this.initialize();
@@ -48,59 +82,126 @@ FIX INSTRUCTIONS:
     await this.initPromise;
   }
   async initialize() {
-    const config = this.config;
-    let dbName = config.database;
-    let serverConfig = null;
-    if (config.url) {
-      try {
-        const parsed = new URL(config.url);
-        dbName = parsed.pathname.replace(/^\//, "");
-        const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
-        serverConfig = serverUrl;
-      } catch (err) {
+    const cache = getSharedMysqlClientCache();
+    const cacheKey = getMysqlCacheKey(this.config);
+    const cached = cache.get(cacheKey);
+    if (cached?.pool) {
+      this.pool = cached.pool;
+      return;
+    }
+    if (cached?.initPromise) {
+      this.pool = await cached.initPromise;
+      return;
+    }
+    const initPromise = (async () => {
+      const config = this.config;
+      let dbName = config.database;
+      let serverConfig = null;
+      if (config.url) {
+        try {
+          const parsed = new URL(config.url);
+          dbName = parsed.pathname.replace(/^\//, "");
+          const serverUrl = `${parsed.protocol}//${parsed.username}:${parsed.password}@${parsed.host}`;
+          serverConfig = serverUrl;
+        } catch (err) {
+        }
+      } else {
+        serverConfig = {
+          host: config.host ?? "localhost",
+          port: config.port ?? 3306,
+          user: config.user,
+          password: config.password
+        };
       }
-    } else {
-      serverConfig = {
-        host: config.host ?? "localhost",
-        port: config.port ?? 3306,
-        user: config.user,
-        password: config.password
+      if (dbName && serverConfig) {
+        try {
+          await this.retryOperation(async () => {
+            const tempConn = await mysql.createConnection(serverConfig);
+            try {
+              await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
+            } finally {
+              await tempConn.end().catch(() => {
+              });
+            }
+          }, 3, 1e3);
+          console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+        } catch (err) {
+          console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
+          if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
+            this.handleConnectionError(err);
+          }
+        }
+      }
+      const defaultPoolOptions = {
+        enableKeepAlive: true,
+        keepAliveInitialDelay: 1e4,
+        connectTimeout: 2e4,
+        dateStrings: true,
+        waitForConnections: true,
+        connectionLimit: 10,
+        queueLimit: 0,
+        ...config.poolOptions
       };
-    }
-    if (dbName && serverConfig) {
+      let pool;
+      if (config.url) {
+        pool = mysql.createPool({
+          uri: config.url,
+          ...defaultPoolOptions
+        });
+      } else {
+        pool = mysql.createPool({
+          host: config.host ?? "localhost",
+          port: config.port ?? 3306,
+          user: config.user,
+          password: config.password,
+          database: config.database,
+          ...defaultPoolOptions
+        });
+      }
       try {
-        const tempConn = await mysql.createConnection(serverConfig);
-        await tempConn.query(`CREATE DATABASE IF NOT EXISTS \`${dbName}\``);
-        await tempConn.end();
-        console.log(`[dyrected/db-mysql] Database "${dbName}" checked/created successfully`);
+        await this.retryOperation(async () => {
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS dyrected_internal (
+              \`key\` VARCHAR(255) PRIMARY KEY,
+              value JSON NOT NULL
+            )
+          `);
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS _dyrected_ai_threads (
+              id VARCHAR(36) PRIMARY KEY,
+              project_id VARCHAR(255) NOT NULL,
+              user_id VARCHAR(255) NOT NULL,
+              title TEXT,
+              created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+              updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+              INDEX idx_ai_threads_user_project (user_id, project_id)
+            )
+          `);
+          await pool.query(`
+            CREATE TABLE IF NOT EXISTS _dyrected_ai_messages (
+              id VARCHAR(36) PRIMARY KEY,
+              thread_id VARCHAR(36) NOT NULL,
+              role VARCHAR(50) NOT NULL,
+              content LONGTEXT NOT NULL,
+              created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+              metadata JSON,
+              INDEX idx_ai_messages_thread_id (thread_id),
+              CONSTRAINT fk_ai_messages_thread FOREIGN KEY (thread_id) REFERENCES _dyrected_ai_threads(id) ON DELETE CASCADE
+            )
+          `);
+        }, 3, 1e3);
       } catch (err) {
-        console.warn(`[dyrected/db-mysql] Auto-creation of database "${dbName}" skipped/failed:`, err.message);
-        if (err.code === "EADDRNOTAVAIL" || err.message?.includes("EADDRNOTAVAIL")) {
-          this.handleConnectionError(err);
-        }
+        this.handleConnectionError(err);
       }
-    }
-    if (config.url) {
-      this.pool = mysql.createPool(config.url);
-    } else {
-      this.pool = mysql.createPool({
-        host: config.host ?? "localhost",
-        port: config.port ?? 3306,
-        user: config.user,
-        password: config.password,
-        database: config.database,
-        dateStrings: true
-      });
-    }
+      return pool;
+    })();
+    cache.set(cacheKey, { initPromise });
     try {
-      await this.pool.query(`
-        CREATE TABLE IF NOT EXISTS dyrected_internal (
-          \`key\` VARCHAR(255) PRIMARY KEY,
-          value JSON NOT NULL
-        )
-      `);
-    } catch (err) {
-      this.handleConnectionError(err);
+      this.pool = await initPromise;
+      cache.set(cacheKey, { pool: this.pool });
+    } catch (error) {
+      cache.delete(cacheKey);
+      throw error;
     }
   }
   async query(sql, params) {
@@ -120,28 +221,92 @@ FIX INSTRUCTIONS:
     }
   }
   getTableName(slug) {
-    return `collection_${slug}`;
+    if (slug.includes(".")) {
+      const parts = slug.split(".");
+      return parts[parts.length - 1].replace(/`/g, "");
+    }
+    return slug.startsWith("collection_") ? slug : `collection_${slug}`;
   }
-  async ensureTable(slug, fields = []) {
-    const tableName = this.getTableName(slug);
-    await this.query(`
-      CREATE TABLE IF NOT EXISTS \`${tableName}\` (
-        id VARCHAR(36) PRIMARY KEY,
-        data JSON NOT NULL,
-        created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
-        updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
-      )
-    `);
+  async getTableColumns(tableName) {
+    const cached = this.tableColumnsCache.get(tableName);
+    if (cached) return cached;
     const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
     const existingCols = cols.map((c) => c.Field);
-    for (const field of fields) {
-      if (field.promoted && !existingCols.includes(field.name)) {
-        console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
-        let sqlType = "TEXT";
-        if (field.type === "number") sqlType = "DECIMAL(19,4)";
-        if (field.type === "boolean") sqlType = "TINYINT(1)";
-        await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+    this.tableColumnsCache.set(tableName, existingCols);
+    return existingCols;
+  }
+  async ensureTable(slug, fields = []) {
+    if (slug === "_dyrected_ai_threads" || slug === "_dyrected_ai_messages") {
+      return;
+    }
+    if (fields.length === 0 && this.ensuredTables.has(slug)) {
+      return;
+    }
+    if (this.tableLocks.has(slug)) {
+      await this.tableLocks.get(slug);
+      if (fields.length === 0 && this.ensuredTables.has(slug)) {
+        return;
+      }
+    }
+    let resolveLock;
+    let rejectLock;
+    const lockPromise = new Promise((resolve, reject) => {
+      resolveLock = resolve;
+      rejectLock = reject;
+    });
+    this.tableLocks.set(slug, lockPromise);
+    try {
+      const tableName = this.getTableName(slug);
+      await this.query(`
+        CREATE TABLE IF NOT EXISTS \`${tableName}\` (
+          id VARCHAR(36) PRIMARY KEY,
+          data JSON NOT NULL,
+          created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
+          updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
+        )
+      `);
+      const existingCols = await this.getTableColumns(tableName);
+      for (const field of fields) {
+        if (field.promoted && !existingCols.includes(field.name)) {
+          console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
+          let sqlType = "TEXT";
+          if (field.type === "number") sqlType = "DECIMAL(19,4)";
+          if (field.type === "boolean") sqlType = "TINYINT(1)";
+          if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
+          try {
+            await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
+            existingCols.push(field.name);
+            this.tableColumnsCache.set(tableName, existingCols);
+          } catch (err) {
+            if (err.code === "ER_DUP_FIELDNAME" || err.errno === 1060 || err.message?.includes("Duplicate column name")) {
+            } else {
+              throw err;
+            }
+          }
+          const escapedField = field.name.replace(/`/g, "``");
+          let castExpr = `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}'))`;
+          if (field.type === "number") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS DECIMAL(19,4)), NULL)`;
+          } else if (field.type === "boolean") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) IN ('true', '1'), 1, 0)`;
+          } else if (field.type === "date" || field.type === "datetime") {
+            castExpr = `STR_TO_DATE(LEFT(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')), 23), '%Y-%m-%d %H:%i:%s.%f')`;
+          }
+          try {
+            await this.query(
+              `UPDATE \`${tableName}\` SET \`${escapedField}\` = ${castExpr} WHERE \`${escapedField}\` IS NULL AND JSON_CONTAINS_PATH(data, 'one', '$.${field.name}')`
+            );
+          } catch {
+          }
+        }
       }
+      this.ensuredTables.add(slug);
+      resolveLock();
+    } catch (err) {
+      rejectLock(err);
+      throw err;
+    } finally {
+      this.tableLocks.delete(slug);
     }
   }
   async find(args) {
@@ -150,8 +315,7 @@ FIX INSTRUCTIONS:
     const limit = args.limit ?? 10;
     const page = args.page ?? 1;
     const offset = (page - 1) * limit;
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     let whereSql = "";
     let whereParams = [];
     if (args.where && Object.keys(args.where).length > 0) {
@@ -214,8 +378,7 @@ FIX INSTRUCTIONS:
   async create(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const id = params.data.id ?? Math.random().toString(36).substring(7);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const data = { ...params.data };
@@ -238,8 +401,7 @@ FIX INSTRUCTIONS:
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const merged = { ...existing ?? {}, ...params.data };
@@ -314,8 +476,7 @@ FIX INSTRUCTIONS:
     }
     const tableName = this.getTableName(args.collection);
     if (!this.inTransaction) await this.ensureTable(args.collection);
-    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
-    const existingCols = cols.map((c) => c.Field);
+    const existingCols = await this.getTableColumns(tableName);
     const toFieldExpr = (field) => {
       if (field === "createdAt") return "`created_at`";
       if (field === "updatedAt") return "`updated_at`";
@@ -408,6 +569,11 @@ FIX INSTRUCTIONS:
     return result;
   }
   async disconnect() {
+    const cache = getSharedMysqlClientCache();
+    const cacheKey = getMysqlCacheKey(this.config);
+    cache.delete(cacheKey);
+    this.ensuredTables.clear();
+    this.tableColumnsCache.clear();
     if (this.initPromise) {
       try {
         await this.initPromise;
@@ -422,8 +588,24 @@ FIX INSTRUCTIONS:
     this.pool = null;
   }
 };
+async function closeAllMysqlClients() {
+  const cache = getSharedMysqlClientCache();
+  const entries = Array.from(cache.values());
+  cache.clear();
+  for (const entry of entries) {
+    try {
+      const pool = entry.pool || await entry.initPromise;
+      if (pool && typeof pool.end === "function") {
+        await pool.end().catch(() => {
+        });
+      }
+    } catch {
+    }
+  }
+}
 var mysqlAdapter = (config) => new MysqlAdapter(config);
 export {
   MysqlAdapter,
+  closeAllMysqlClients,
   mysqlAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/db-mysql",
-  "version": "2.13.0",
+  "version": "2.13.3",
   "description": "MySQL adapter for Dyrected CMS",
   "type": "module",
   "files": [
@@ -16,13 +16,9 @@
       "require": "./dist/index.cjs"
     }
   },
-  "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts --clean",
-    "dev": "tsup src/index.ts --format esm,cjs --dts --watch"
-  },
   "dependencies": {
-    "@dyrected/core": "workspace:^",
-    "mysql2": "^3.22.3"
+    "mysql2": "^3.22.3",
+    "@dyrected/core": "^2.13.3"
   },
   "devDependencies": {
     "tsup": "^8.0.0",
@@ -36,5 +32,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format esm,cjs --dts --clean",
+    "dev": "tsup src/index.ts --format esm,cjs --dts --watch"
   }
 }