@seip/blue-bird 0.7.5 → 0.8.0

package/core/config.js

@@ -1,52 +1,52 @@
-import path from "path";
-
-let _cachedProps = null;
-
-/**
- * Configuration class to manage application-wide settings and environment variables.
- */
-class Config {
-  /**
-   * Returns the base directory of the application.
-   * @returns {string} The current working directory.
-   */
-  static dirname() {
-    return process.cwd();
-  }
-
-  /**
-   * Retrieves application properties from environment variables or default values.
-   * Results are cached after first call for performance.
-   * @returns {{debug: boolean, descriptionMeta: string, keywordsMeta: string, titleMeta: string, authorMeta: string, description: string, title: string, version: string, langMeta: string, host: string, appUrl: string, port: number, static: {path: string, options: Object}}} The configuration properties object.
-   * @example
-   * const props = Config.props();
-   * console.log(props);
-   */
-  static props() {
-    if (_cachedProps) return _cachedProps;
-
-    const portRaw = parseInt(process.env.PORT);
-
-    _cachedProps = {
-      debug: process.env.DEBUG === "true",
-      descriptionMeta: process.env.DESCRIPTION_META || "",
-      keywordsMeta: process.env.KEYWORDS_META || "",
-      titleMeta: process.env.TITLE_META || "",
-      authorMeta: process.env.AUTHOR_META || "",
-      description: process.env.DESCRIPTION || "",
-      title: process.env.TITLE || "",
-      version: process.env.VERSION || "1.0.0",
-      langMeta: process.env.LANGMETA || "en",
-      host: process.env.HOST || "http://localhost",
-      appUrl: process.env.APP_URL || process.env.HOST || "http://localhost",
-      port: Number.isNaN(portRaw) ? 3000 : portRaw,
-      jwtSecret: process.env.JWT_SECRET,
-      static: {
-        path: process.env.STATIC_PATH || "frontend/public",
-        options: {},
-      },
-    };
-    return _cachedProps;
-  }
-}
-export default Config;
+import path from "path";
+
+let _cachedProps = null;
+
+/**
+ * Configuration class to manage application-wide settings and environment variables.
+ */
+class Config {
+  /**
+   * Returns the base directory of the application.
+   * @returns {string} The current working directory.
+   */
+  static dirname() {
+    return process.cwd();
+  }
+
+  /**
+   * Retrieves application properties from environment variables or default values.
+   * Results are cached after first call for performance.
+   * @returns {{debug: boolean, descriptionMeta: string, keywordsMeta: string, titleMeta: string, authorMeta: string, description: string, title: string, version: string, langMeta: string, host: string, appUrl: string, port: number, static: {path: string, options: Object}}} The configuration properties object.
+   * @example
+   * const props = Config.props();
+   * console.log(props);
+   */
+  static props() {
+    if (_cachedProps) return _cachedProps;
+
+    const portRaw = parseInt(process.env.PORT);
+
+    _cachedProps = {
+      debug: process.env.DEBUG === "true",
+      descriptionMeta: process.env.DESCRIPTION_META || "",
+      keywordsMeta: process.env.KEYWORDS_META || "",
+      titleMeta: process.env.TITLE_META || "",
+      authorMeta: process.env.AUTHOR_META || "",
+      description: process.env.DESCRIPTION || "",
+      title: process.env.TITLE || "",
+      version: process.env.VERSION || "1.0.0",
+      langMeta: process.env.LANGMETA || "en",
+      host: process.env.HOST || "http://localhost",
+      appUrl: process.env.APP_URL || process.env.HOST || "http://localhost",
+      port: Number.isNaN(portRaw) ? 3000 : portRaw,
+      jwtSecret: process.env.JWT_SECRET,
+      static: {
+        path: process.env.STATIC_PATH || "frontend/public",
+        options: {},
+      },
+    };
+    return _cachedProps;
+  }
+}
+export default Config;

package/core/database.js

@@ -1,182 +1,263 @@
-import crypto from "node:crypto";
-import { getRedisClient } from "./cache.js";
-
-let mysqlPromise = null;
-try {
-  mysqlPromise = await import("mysql2/promise");
-} catch (err) {
-  console.error(
-    "[DATABASE ERROR] mysql2 package is not installed. Database wrapper is disabled.",
-  );
-}
-
-/**
- * Database class wrapping mysql2 with reconnection retries, connection pool, and query caching.
- */
-class Database {
-  /**
-   * Initializes config from DATABASE_URL or DB_* environment variables.
-   */
-  constructor(connectionLimit = 10, queueLimit = 0) {
-    this.pool = null;
-    this.config = {
-      host: process.env.DB_HOST || "localhost",
-      user: process.env.DB_USER || "root",
-      password: process.env.DB_PASSWORD || "root",
-      database: process.env.DB_NAME || "blue_bird",
-      port: parseInt(process.env.DB_PORT) || 3306,
-      charset: "utf8mb4",
-      waitForConnections: true,
-      connectionLimit: connectionLimit,
-      queueLimit: queueLimit,
-    };
-
-    if (
-      process.env.DATABASE_URL &&
-      process.env.DATABASE_URL.startsWith("mysql://")
-    ) {
-      try {
-        const url = new URL(process.env.DATABASE_URL);
-        this.config.host = url.hostname;
-        this.config.port = parseInt(url.port) || 3306;
-        this.config.user = url.username;
-        this.config.password = url.password;
-        this.config.database = url.pathname.substring(1);
-      } catch (err) {
-        console.error(
-          "[DATABASE ERROR] Failed to parse DATABASE_URL:",
-          err.message,
-        );
-      }
-    }
-  }
-
-  /**
-   * Creates the MySQL connection pool with 3 retry attempts on failure.
-   * @param {number} [retries=3] - Number of connection attempts.
-   * @returns {Promise<boolean>} True if connection pool was created.
-   */
-  async init(retries = 3) {
-    if (!mysqlPromise) return false;
-    if (this.pool) return true;
-
-    for (let attempt = 1; attempt <= retries; attempt++) {
-      try {
-        this.pool = mysqlPromise.createPool(this.config);
-        await this.pool.query("SELECT 1");
-        return true;
-      } catch (err) {
-        this.pool = null;
-        if (attempt === retries) {
-          console.error(
-            `[DATABASE ERROR] Connection failed after ${retries} attempts:`,
-            err.message,
-          );
-          return false;
-        }
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Runs a SQL query with parameters and formatting options.
-   *
-   * @param {string} sql - SQL query string.
-   * @param {Array} [params=[]] - Query parameter array.
-   * @param {Object|string} [options={}] - Query options. Supports 'return_row', 'return_rows', and 'cache' (seconds).
-   * @returns {Promise<*>| int | boolean} Formatted query result or false on error, or insert id of insert query.
-   * @example select
-   *  const result = await connection.query("SELECT * FROM users", [], { return_row: true, cache: 60 });
-   * @example insert
-   *  const result = await connection.query("INSERT INTO users (name, email, password) VALUES (?, ?, ?)", ["John Doe", "[EMAIL_ADDRESS]", "123456"]);
-   * @example update
-   *  const result = await connection.query("UPDATE users SET name = ? WHERE id = ?", ["John Doe", 1]);
-   * @example delete
-   *  const result = await connection.query("DELETE FROM users WHERE id = ?", [1]);
-   */
-  async query(sql, params = [], options = {}) {
-    if (!mysqlPromise) return false;
-    if (!this.pool) {
-      const initialized = await this.init();
-      if (!initialized) return false;
-    }
-
-    const queryOptions =
-      typeof options === "string" ? { [options]: true } : options;
-    const cleanSql = sql.trim();
-    const isSelect = cleanSql.toLowerCase().startsWith("select");
-    const isInsert = cleanSql.toLowerCase().startsWith("insert");
-
-    const redisClient = getRedisClient();
-    let cacheKey = null;
-    const isDebug = queryOptions.debug ?? false;
-    if (isDebug) {
-      console.log("[DATABASE DEBUG] SQL:", sql);
-      console.log("[DATABASE DEBUG] PARAMS:", params);
-      console.log("[DATABASE DEBUG] OPTIONS:", options);
-    }
-
-    if (isSelect && queryOptions.cache && redisClient) {
-      const hash = crypto
-        .createHash("md5")
-        .update(cleanSql + JSON.stringify(params))
-        .digest("hex");
-      cacheKey = `db:${hash}`;
-      try {
-        if (isDebug) {
-          console.log("[DATABASE DEBUG ][Redis] CACHE KEY:", cacheKey);
-        }
-        const cached = await redisClient.get(cacheKey);
-        if (cached) {
-          if (isDebug) {
-            console.log("[DATABASE DEBUG ][Redis] CACHE HIT");
-          }
-          return JSON.parse(cached);
-        } else {
-          if (isDebug) {
-            console.log("[DATABASE DEBUG ][Redis] CACHE MISS");
-          }
-        }
-      } catch (err) {
-        console.error(
-          "[DATABASE ERROR] Failed to get cached data:",
-          err.message,
-        );
-      }
-    }
-
-    try {
-      const [results] = await this.pool.execute(cleanSql, params);
-
-      if (isSelect) {
-        const rows = Array.isArray(results) ? results : [];
-        if (cacheKey && queryOptions.cache && redisClient) {
-          await redisClient
-            .set(cacheKey, JSON.stringify(rows), {
-              EX: parseInt(queryOptions.cache),
-            })
-            .catch(() => {});
-        }
-        if (queryOptions.return_row) {
-          return rows.length > 0 ? rows[0] : null;
-        }
-        return rows;
-      }
-
-      if (isInsert) {
-        return results.insertId || results;
-      }
-
-      return results;
-    } catch (err) {
-      console.error("[DATABASE ERROR] Query execution failed:", err.message);
-      throw err;
-    }
-  }
-}
-
-const connection = new Database();
-export default connection;
-export { Database };
+import crypto from "node:crypto";
+import { getRedisClient } from "./cache.js";
+
+let DB_TYPE = (process.env.DB_TYPE || "").toLowerCase();
+
+if (
+  !DB_TYPE &&
+  process.env.DATABASE_URL &&
+  !process.env.DATABASE_URL.startsWith("#")
+) {
+  if (
+    process.env.DATABASE_URL.startsWith("postgres://") ||
+    process.env.DATABASE_URL.startsWith("postgresql://")
+  ) {
+    DB_TYPE = "postgres";
+  } else if (process.env.DATABASE_URL.startsWith("mysql://")) {
+    DB_TYPE = "mysql";
+  }
+}
+if (!DB_TYPE) {
+  DB_TYPE = "mysql";
+}
+
+let mysqlPromise = null;
+let pgPromise = null;
+
+if (DB_TYPE === "postgres") {
+  try {
+    pgPromise = await import("pg");
+  } catch (err) {
+    console.error(
+      "[DATABASE ERROR] pg package is not installed. Database wrapper is disabled.",
+    );
+  }
+} else if (DB_TYPE === "mysql") {
+  try {
+    mysqlPromise = await import("mysql2/promise");
+  } catch (err) {
+    console.error(
+      "[DATABASE ERROR] mysql2 package is not installed. Database wrapper is disabled.",
+    );
+  }
+}
+
+/**
+ * Database class wrapping mysql2 and pg with reconnection retries, connection pooling, and query caching.
+ */
+class Database {
+  /**
+   * Initializes config from DATABASE_URL or DB_* environment variables.
+   * For default Database use .env DB_HOST, DB_USER, DB_PASSWORD...
+   * @param {number} [connectionLimit=10] - Maximum number of connections in the pool.
+   * @param {number} [queueLimit=0] - Maximum number of queued connections.
+   * @param {Object} [config={}] - Additional configuration options: DB_HOST, DB_USER, DB_PASSWORD, DB_NAME, DB_PORT, DB_TYPE.
+   * @example const connection = new Database(10, 0, { DB_HOST: "localhost", DB_USER: "root", DB_PASSWORD: "password", DB_NAME: "blue_bird", DB_PORT: 3306, DB_TYPE: "mysql" });
+   */
+  constructor(connectionLimit = 10, queueLimit = 0, config = {}) {
+    this.pool = null;
+    this.type = DB_TYPE;
+
+    this.config = {
+      ...config,
+      host: process.env.DB_HOST || "localhost",
+      user:
+        process.env.DB_USER || (this.type === "postgres" ? "postgres" : "root"),
+      password: process.env.DB_PASSWORD || "root",
+      database: process.env.DB_NAME || "blue_bird",
+      port:
+        parseInt(process.env.DB_PORT) ||
+        (this.type === "postgres" ? 5432 : 3306),
+      charset: "utf8mb4",
+      waitForConnections: true,
+      connectionLimit: connectionLimit,
+      queueLimit: queueLimit,
+      max: connectionLimit,
+    };
+
+    if (process.env.DATABASE_URL && !process.env.DATABASE_URL.startsWith("#")) {
+      try {
+        if (
+          process.env.DATABASE_URL.startsWith("mysql://") ||
+          process.env.DATABASE_URL.startsWith("postgres://") ||
+          process.env.DATABASE_URL.startsWith("postgresql://")
+        ) {
+          const url = new URL(process.env.DATABASE_URL);
+          this.config.host = url.hostname;
+          this.config.port =
+            parseInt(url.port) || (this.type === "postgres" ? 5432 : 3306);
+          this.config.user = url.username;
+          this.config.password = url.password;
+          this.config.database = url.pathname.substring(1);
+          this.config.connectionString = process.env.DATABASE_URL;
+        }
+      } catch (err) {
+        console.error(
+          "[DATABASE ERROR] Failed to parse DATABASE_URL:",
+          err.message,
+        );
+      }
+    }
+  }
+
+  /**
+   * Creates the database connection pool with 3 retry attempts on failure.
+   * @param {number} [retries=3] - Number of connection attempts.
+   * @returns {Promise<boolean>} True if connection pool was created.
+   */
+  async init(retries = 3) {
+    if (!mysqlPromise && !pgPromise) return false;
+    if (this.pool) return true;
+
+    for (let attempt = 1; attempt <= retries; attempt++) {
+      try {
+        if (this.type === "postgres" && pgPromise) {
+          const pg = pgPromise.default || pgPromise;
+          this.pool = new pg.Pool(this.config);
+          await this.pool.query("SELECT 1");
+        } else if (mysqlPromise) {
+          const { max, connectionString, ...mysqlConfig } = this.config;
+          this.pool = mysqlPromise.createPool(mysqlConfig);
+          await this.pool.query("SELECT 1");
+        }
+        return true;
+      } catch (err) {
+        this.pool = null;
+        if (attempt === retries) {
+          console.error(
+            `[DATABASE ERROR] Connection failed after ${retries} attempts:`,
+            err.message,
+          );
+          return false;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Runs a SQL query with parameters and formatting options.
+   * Supports both MySQL and PostgreSQL (converting ? to $1, $2 for Postgres automatically).
+   *
+   * @param {string} sql - SQL query string.
+   * @param {Array} [params=[]] - Query parameter array.
+   * @param {Object|string} [options={}] - Query options. Supports 'return_row', 'return_rows', and 'cache' (seconds).
+   * @returns {Promise<*>| int | boolean} Formatted query result or false on error, or insert id of insert query.
+   * @example const result = await connection.query("SELECT * FROM users WHERE id = ?", [1], "return_row");
+   * @example const result = await connection.query("SELECT * FROM users WHERE id = ?", [1], { cache: 60 });
+   * @example const result = await connection.query("SELECT * FROM users WHERE id = ?", [1], { debug: true });
+   * @example const insert_id = await connection.query("INSERT INTO users (name, email, password) VALUES (?, ?, ?)", ["John Doe", "john@example.com", "password"]);
+   */
+  async query(sql, params = [], options = {}) {
+    if (!mysqlPromise && !pgPromise) return false;
+    if (!this.pool) {
+      const initialized = await this.init();
+      if (!initialized) return false;
+    }
+
+    const queryOptions =
+      typeof options === "string" ? { [options]: true } : options;
+    const cleanSql = sql.trim();
+    const isSelect = cleanSql.toLowerCase().startsWith("select");
+    const isInsert = cleanSql.toLowerCase().startsWith("insert");
+
+    const redisClient = getRedisClient();
+    let cacheKey = null;
+    const isDebug = queryOptions.debug ?? false;
+    if (isDebug) {
+      console.log("[DATABASE DEBUG] SQL:", sql);
+      console.log("[DATABASE DEBUG] PARAMS:", params);
+      console.log("[DATABASE DEBUG] OPTIONS:", options);
+    }
+
+    if (isSelect && queryOptions.cache && redisClient) {
+      const hash = crypto
+        .createHash("md5")
+        .update(cleanSql + JSON.stringify(params))
+        .digest("hex");
+      cacheKey = `db:${hash}`;
+      try {
+        if (isDebug) {
+          console.log("[DATABASE DEBUG][Redis] CACHE KEY:", cacheKey);
+        }
+        const cached = await redisClient.get(cacheKey);
+        if (cached) {
+          if (isDebug) {
+            console.log("[DATABASE DEBUG][Redis] CACHE HIT");
+          }
+          return JSON.parse(cached);
+        } else {
+          if (isDebug) {
+            console.log("[DATABASE DEBUG][Redis] CACHE MISS");
+          }
+        }
+      } catch (err) {
+        console.error(
+          "[DATABASE ERROR] Failed to get cached data:",
+          err.message,
+        );
+      }
+    }
+
+    try {
+      if (this.type === "postgres" && pgPromise) {
+        let paramIndex = 1;
+        const pgSql = cleanSql.replace(/\?/g, () => `$${paramIndex++}`);
+        const res = await this.pool.query(pgSql, params);
+
+        if (isSelect) {
+          const rows = res.rows || [];
+          if (cacheKey && queryOptions.cache && redisClient) {
+            await redisClient
+              .set(cacheKey, JSON.stringify(rows), {
+                EX: parseInt(queryOptions.cache),
+              })
+              .catch(() => {});
+          }
+          if (queryOptions.return_row) {
+            return rows.length > 0 ? rows[0] : null;
+          }
+          return rows;
+        }
+
+        if (isInsert) {
+          if (res.rows && res.rows.length > 0) {
+            return res.rows[0].id || res.rows[0];
+          }
+          return res.rowCount;
+        }
+
+        return res.rowCount;
+      } else {
+        const [results] = await this.pool.execute(cleanSql, params);
+
+        if (isSelect) {
+          const rows = Array.isArray(results) ? results : [];
+          if (cacheKey && queryOptions.cache && redisClient) {
+            await redisClient
+              .set(cacheKey, JSON.stringify(rows), {
+                EX: parseInt(queryOptions.cache),
+              })
+              .catch(() => {});
+          }
+          if (queryOptions.return_row) {
+            return rows.length > 0 ? rows[0] : null;
+          }
+          return rows;
+        }
+
+        if (isInsert) {
+          return results.insertId || results;
+        }
+
+        return results;
+      }
+    } catch (err) {
+      console.error("[DATABASE ERROR] Query execution failed:", err.message);
+      throw err;
+    }
+  }
+}
+
+export { Database, DB_TYPE };