@seip/blue-bird 0.7.4 → 0.7.6

package/core/database.js

@@ -1,47 +1,96 @@
 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;
-try {
-  mysqlPromise = await import("mysql2/promise");
-} catch (err) {
-  console.error(
-    "[DATABASE ERROR] mysql2 package is not installed. Database wrapper is disabled.",
-  );
+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 with reconnection retries, connection pool, and query caching.
+ * 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) {
+  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 || "root",
+      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) || 3306,
+      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("mysql://")
-    ) {
+    if (process.env.DATABASE_URL && !process.env.DATABASE_URL.startsWith("#")) {
       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);
+        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:",
@@ -52,18 +101,25 @@ class Database {
   }
 
   /**
-   * Creates the MySQL connection pool with 3 retry attempts on failure.
+   * 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) return false;
+    if (!mysqlPromise && !pgPromise) 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");
+        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;
@@ -82,22 +138,19 @@ class Database {
 
   /**
    * 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 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]);
+   * @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) return false;
+    if (!mysqlPromise && !pgPromise) return false;
     if (!this.pool) {
       const initialized = await this.init();
       if (!initialized) return false;
@@ -126,17 +179,17 @@ class Database {
       cacheKey = `db:${hash}`;
       try {
         if (isDebug) {
-          console.log("[DATABASE DEBUG ][Redis] CACHE KEY:", cacheKey);
+          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");
+            console.log("[DATABASE DEBUG][Redis] CACHE HIT");
           }
           return JSON.parse(cached);
         } else {
           if (isDebug) {
-            console.log("[DATABASE DEBUG ][Redis] CACHE MISS");
+            console.log("[DATABASE DEBUG][Redis] CACHE MISS");
           }
         }
       } catch (err) {
@@ -148,28 +201,58 @@ class Database {
     }
 
     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 (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 (queryOptions.return_row) {
-          return rows.length > 0 ? rows[0] : null;
+
+        if (isInsert) {
+          if (res.rows && res.rows.length > 0) {
+            return res.rows[0].id || res.rows[0];
+          }
+          return res.rowCount;
         }
-        return rows;
-      }
 
-      if (isInsert) {
-        return results.insertId || results;
-      }
+        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;
+        }
 
-      return results;
+        if (isInsert) {
+          return results.insertId || results;
+        }
+
+        return results;
+      }
     } catch (err) {
       console.error("[DATABASE ERROR] Query execution failed:", err.message);
       throw err;
@@ -177,6 +260,4 @@ class Database {
   }
 }
 
-const connection = new Database();
-export default connection;
-export { Database };
+export { Database, DB_TYPE };

package/docker/docker-compose.mysql.yml

@@ -0,0 +1,92 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    container_name: ${TITLE:-bluebird}-app
+    restart: unless-stopped
+    expose:
+      - "3000"
+    volumes:
+      - .:/app
+      - /app/node_modules
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=production
+      - DEBUG=false
+      - DATABASE_URL=mysql://${DB_USER:-root}:${DB_PASSWORD:-root}@mysql:${DB_PORT:-3306}/${DB_NAME:-blue_bird}
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - PORT=3000
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  nginx:
+    image: nginx:1.27-alpine
+    container_name: ${TITLE:-bluebird}-nginx
+    restart: unless-stopped
+    ports:
+      - "${PORT:-3000}:80"
+    volumes:
+      - .:/app:ro
+      - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      app:
+        condition: service_started
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  mysql:
+    image: mysql:8.0
+    container_name: ${TITLE:-bluebird}-mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-root}
+      MYSQL_DATABASE: ${DB_NAME:-blue_bird}
+    ports:
+      - "${DB_PORT:-3306}:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${DB_PASSWORD:-root}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    networks:
+      - bluebird_net
+
+  redis:
+    image: redis:7-alpine
+    container_name: ${TITLE:-bluebird}-redis
+    restart: unless-stopped
+    ports:
+      - "${REDIS_PORT:-6379}:6379"
+    volumes:
+      - redis_data:/data
+    networks:
+      - bluebird_net
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  mysql_data:
+  redis_data:
+
+networks:
+  bluebird_net:
+    name: ${TITLE:-bluebird}_network
+    driver: bridge

package/docker/docker-compose.none.yml

@@ -0,0 +1,68 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    container_name: ${TITLE:-bluebird}-app
+    restart: unless-stopped
+    expose:
+      - "3000"
+    volumes:
+      - .:/app
+      - /app/node_modules
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=production
+      - DEBUG=false
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - PORT=3000
+    depends_on:
+      redis:
+        condition: service_healthy
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  nginx:
+    image: nginx:1.27-alpine
+    container_name: ${TITLE:-bluebird}-nginx
+    restart: unless-stopped
+    ports:
+      - "${PORT:-3000}:80"
+    volumes:
+      - .:/app:ro
+      - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      app:
+        condition: service_started
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  redis:
+    image: redis:7-alpine
+    container_name: ${TITLE:-bluebird}-redis
+    restart: unless-stopped
+    ports:
+      - "${REDIS_PORT:-6379}:6379"
+    volumes:
+      - redis_data:/data
+    networks:
+      - bluebird_net
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  redis_data:
+
+networks:
+  bluebird_net:
+    name: ${TITLE:-bluebird}_network
+    driver: bridge

package/docker/docker-compose.postgres.yml

@@ -0,0 +1,93 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    container_name: ${TITLE:-bluebird}-app
+    restart: unless-stopped
+    expose:
+      - "3000"
+    volumes:
+      - .:/app
+      - /app/node_modules
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=production
+      - DEBUG=false
+      - DATABASE_URL=postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-root}@postgres:${DB_PORT:-5432}/${DB_NAME:-blue_bird}?schema=public
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - PORT=3000
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  nginx:
+    image: nginx:1.27-alpine
+    container_name: ${TITLE:-bluebird}-nginx
+    restart: unless-stopped
+    ports:
+      - "${PORT:-3000}:80"
+    volumes:
+      - .:/app:ro
+      - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      app:
+        condition: service_started
+    networks:
+      - bluebird_net
+    profiles:
+      - prod
+
+  postgres:
+    image: postgres:18-alpine
+    container_name: ${TITLE:-bluebird}-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: ${DB_USER:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-root}
+      POSTGRES_DB: ${DB_NAME:-blue_bird}
+    ports:
+      - "${DB_PORT:-5432}:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-blue_bird}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    networks:
+      - bluebird_net
+
+  redis:
+    image: redis:7-alpine
+    container_name: ${TITLE:-bluebird}-redis
+    restart: unless-stopped
+    ports:
+      - "${REDIS_PORT:-6379}:6379"
+    volumes:
+      - redis_data:/data
+    networks:
+      - bluebird_net
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  postgres_data:
+  redis_data:
+
+networks:
+  bluebird_net:
+    name: ${TITLE:-bluebird}_network
+    driver: bridge

package/docker-compose.yml

@@ -15,7 +15,7 @@ services:
     environment:
       - NODE_ENV=production
       - DEBUG=false
-      - DATABASE_URL=mysql://root:${DB_PASSWORD:-root}@mysql:3306/${DB_NAME:-blue_bird}
+      - DATABASE_URL=mysql://${DB_USER:-root}:${DB_PASSWORD:-root}@mysql:${DB_PORT:-3306}/${DB_NAME:-blue_bird}
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - PORT=3000
@@ -90,4 +90,3 @@ networks:
   bluebird_net:
     name: ${TITLE:-bluebird}_network
     driver: bridge
-

package/frontend/src/http/api.js

@@ -1,4 +1,7 @@
-const port = (import.meta.env.PORT || "3000").replace(/^["']|["']$/g, "");
+const defaultPort = (import.meta.env.PORT || "3000").replace(
+  /^["']|["']$/g,
+  "",
+);
 const host = (import.meta.env.HOST || "localhost").replace(/^["']|["']$/g, "");
 
 /**
@@ -7,18 +10,20 @@ const host = (import.meta.env.HOST || "localhost").replace(/^["']|["']$/g, "");
  * @param {string} [path] - API path relative to the server root (e.g. "api/users").
  * @param {URL} [requestUrl] - Current request URL (pass `Astro.url` from the page). Required in production.
  * @returns {string} Absolute URL ready for fetch.
+ * @example apiUrl('api/', Astro.url)
  */
 export function apiUrl(path = "", requestUrl) {
-  if (import.meta.env.DEV) {
-    return `http://${host}:${port}/${path}`;
-  }
   if (!requestUrl) {
-    throw new Error("apiUrl: requestUrl is required in production (pass Astro.url)");
+    throw new Error(
+      "apiUrl: requestUrl is required in production (pass Astro.url)",
+    );
   }
   const url = new URL(`/${path}`, requestUrl);
-  if (url.hostname === "localhost") {
-    url.hostname = "127.0.0.1";
-    url.port = port;
-  }
+  const runtimePort =
+    (typeof process !== "undefined" && process.env && process.env.PORT) ||
+    defaultPort;
+  url.hostname = "127.0.0.1";
+  url.port = runtimePort;
+  url.protocol = "http:";
   return url.href;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seip/blue-bird",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Express opinionated framework with HTML rendering, API architecture, built-in JWT auth, validation, caching, and SEO",
   "type": "module",
   "exports": {
@@ -64,9 +64,8 @@
     "express-rate-limit": "^8.2.1",
     "helmet": "^8.1.0",
     "jsonwebtoken": "^9.0.2",
-    "multer": "^2.0.2",
-    "mysql2": "^3.22.6",
-    "redis": "^4.7.0",
+    "multer": "^2.0.2", 
+    "redis": "^6.1.0",
     "xss": "^1.0.15"
   }
 }

package/backend/logs/2026-07-14/info.log

@@ -1,48 +0,0 @@
- 2026-07-14 22:04:34 -::1 -[GET] / 
- 2026-07-14 22:04:38 -::1 -[GET] /about 
- 2026-07-14 22:04:38 -::1 -[GET] /about 
- 2026-07-14 22:04:39 -::1 -[GET] / 
- 2026-07-14 22:04:39 -::1 -[GET] / 
- 2026-07-14 22:06:26 -::1 -[GET] /api/users 
- 2026-07-14 22:08:02 -::1 -[GET] /api/users 
- 2026-07-14 22:08:05 -::1 -[GET] /api/ 
- 2026-07-14 22:42:04 -::1 -[GET] /api/auth_generate 
- 2026-07-14 22:42:05 -::1 -[GET] /api/auth_generate 
- 2026-07-14 22:42:10 -::1 -[GET] /api/auth_verify 
- 2026-07-14 22:42:12 -::1 -[GET] /api/auth_verify 
- 2026-07-14 22:42:21 -::1 -[GET] /api/auth_logout 
- 2026-07-14 22:42:24 -::1 -[GET] /api/auth_verify 
- 2026-07-14 22:42:28 -::1 -[GET] / 
- 2026-07-14 22:42:28 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:42:29 -::1 -[GET] / 
- 2026-07-14 22:42:29 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:42:30 -::1 -[GET] /about 
- 2026-07-14 22:42:31 -::1 -[GET] /about 
- 2026-07-14 22:42:32 -::1 -[GET] / 
- 2026-07-14 22:42:32 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:42:32 -::1 -[GET] / 
- 2026-07-14 22:42:32 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:42:33 -::1 -[GET] /about 
- 2026-07-14 22:42:35 -::1 -[GET] / 
- 2026-07-14 22:42:35 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:42:37 -::1 -[GET] /about 
- 2026-07-14 22:42:38 -::1 -[GET] / 
- 2026-07-14 22:42:38 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:48:54 -::1 -[GET] / 
- 2026-07-14 22:48:54 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:48:56 -::1 -[GET] /about 
- 2026-07-14 22:48:58 -::1 -[GET] /about 
- 2026-07-14 22:48:59 -::1 -[GET] / 
- 2026-07-14 22:48:59 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:48:59 -::1 -[GET] / 
- 2026-07-14 22:48:59 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:49:01 -::1 -[GET] /about 
- 2026-07-14 22:49:02 -::1 -[GET] / 
- 2026-07-14 22:49:02 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:49:03 -::1 -[GET] /about 
- 2026-07-14 22:49:04 -::1 -[GET] / 
- 2026-07-14 22:49:04 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:49:05 -::1 -[GET] /about 
- 2026-07-14 22:49:07 -::1 -[GET] / 
- 2026-07-14 22:49:07 -::ffff:127.0.0.1 -[GET] /api/ 
- 2026-07-14 22:49:07 -::1 -[GET] /about