@skalfa/skalfa-api-core 1.0.3 → 1.0.8

package/dist/validation/validation.js

@@ -1,28 +1,13 @@
 import validator from "validator";
 import { db } from "@skalfa/skalfa-orm";
-// ==================================>
-// ## Check validate field from rules
-// ==================================>
+// =====================================>
+// ## Validation: validate request data
+// =====================================>
 export async function validate(data, rules) {
     const errors = {};
     for (const field in rules) {
         const fieldRules = normalizeRules(rules[field]);
         if (field.includes("*")) {
-            // const [arrayPath, childPath] = field.split(".*.")
-            // const arr = getNestedValue(data, arrayPath)
-            // if (!Array.isArray(arr)) {
-            //   addError(errors, arrayPath, `${arrayPath} harus berupa array`)
-            //   continue
-            // }
-            // for (let i = 0; i < arr.length; i++) {
-            //   const value = childPath
-            //     ? getNestedValue(arr[i], childPath)
-            //     : arr[i]
-            //   const itemField = childPath
-            //     ? `${arrayPath}.${i}.${childPath}`
-            //     : `${arrayPath}.${i}`
-            //   await checkRules({ field: itemField, value, rules: fieldRules, data, errors })
-            // }
             const segments = field.split(".");
             await nestedValidation({ value: data, segments, rules: fieldRules, fieldPath: "", data, errors });
             continue;
@@ -47,12 +32,16 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             case "string":
             case "text":
+                if (!value)
+                    break;
                 if (typeof value !== "string") {
                     addError(errors, field, `${field} harus berupa string`);
                 }
                 break;
             case "numeric":
             case "number":
+                if (!value)
+                    break;
                 if (!validator.isNumeric(String(value))) {
                     addError(errors, field, `${field} harus berupa angka`);
                 }
@@ -63,22 +52,30 @@ async function checkRules({ field, value, rules, data, errors }) {
                 }
                 break;
             case "email":
+                if (!value)
+                    break;
                 if (!validator.isEmail(String(value))) {
                     addError(errors, field, `${field} harus berupa email yang valid`);
                 }
                 break;
             case "url":
+                if (!value)
+                    break;
                 if (!validator.isURL(String(value))) {
                     addError(errors, field, `${field} harus berupa URL yang valid`);
                 }
                 break;
             case "date":
+                if (!value)
+                    break;
                 if (!validator.isDate(String(value))) {
                     addError(errors, field, `${field} harus berupa tanggal yang valid`);
                 }
                 break;
             // === LENGTH ===
             case "min": {
+                if (!value)
+                    break;
                 const min = parseInt(param);
                 if (!validator.isLength(String(value), { min })) {
                     addError(errors, field, `${field} minimal ${min} karakter`);
@@ -86,6 +83,8 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             }
             case "max": {
+                if (!value)
+                    break;
                 const max = parseInt(param);
                 if (!validator.isLength(String(value), { max })) {
                     addError(errors, field, `${field} maksimal ${max} karakter`);
@@ -93,6 +92,8 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             }
             case "between": {
+                if (!value)
+                    break;
                 const [minVal, maxVal] = param.split(",").map(Number);
                 if (!validator.isLength(String(value), { min: minVal, max: maxVal })) {
                     addError(errors, field, `${field} harus antara ${minVal} - ${maxVal} karakter`);
@@ -101,6 +102,8 @@ async function checkRules({ field, value, rules, data, errors }) {
             }
             // === SET MEMBERSHIP ===
             case "in": {
+                if (!value)
+                    break;
                 const allowed = param.split(",");
                 if (!allowed.includes(String(value))) {
                     addError(errors, field, `${field} harus salah satu dari: ${allowed.join(", ")}`);
@@ -108,17 +111,22 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             }
             case "not_in": {
+                if (!value)
+                    break;
                 const notAllowed = param.split(",");
                 if (notAllowed.includes(String(value))) {
                     addError(errors, field, `${field} tidak boleh salah satu dari: ${notAllowed.join(", ")}`);
                 }
                 break;
             }
-            case "array":
+            case "array": {
+                if (!value)
+                    break;
                 if (!Array.isArray(value)) {
                     addError(errors, field, `${field} harus berupa array`);
                 }
                 break;
+            }
             // === RELATIONAL ===
             case "confirmed":
                 if (value !== getNestedValue(data, `${field}_confirmation`)) {
@@ -137,6 +145,8 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             // === REGEX ===
             case "regex":
+                if (!value)
+                    break;
                 try {
                     const pattern = new RegExp(param);
                     if (!pattern.test(String(value))) {
@@ -149,14 +159,15 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             // === DATABASE VALIDATION ===
             case "unique": {
-                if (!db) {
-                    console.warn(`[Validation Warning] "unique" rule skipped on field "${field}" because database is not configured/installed.`);
+                if (!value)
                     break;
-                }
                 const [table, column, exceptId] = param.split(",");
                 const query = db.table(table).where(column, value);
                 if (exceptId)
                     query.whereNot("id", exceptId);
+                if (await db.schema.hasColumn(table, "deleted_at")) {
+                    query.whereNull("deleted_at");
+                }
                 const existing = await query.first();
                 if (existing) {
                     addError(errors, field, `${field} sudah digunakan`);
@@ -164,12 +175,14 @@ async function checkRules({ field, value, rules, data, errors }) {
                 break;
             }
             case "exists": {
-                if (!db) {
-                    console.warn(`[Validation Warning] "exists" rule skipped on field "${field}" because database is not configured/installed.`);
+                if (!value)
                     break;
-                }
                 const [table, column] = param.split(",");
-                const existing = await db.table(table).where(column, value).first();
+                const query = db.table(table).where(column, value);
+                if (await db.schema.hasColumn(table, "deleted_at")) {
+                    query.whereNull("deleted_at");
+                }
+                const existing = await query.first();
                 if (!existing) {
                     addError(errors, field, `${field} tidak ditemukan di ${table}`);
                 }
@@ -180,13 +193,7 @@ async function checkRules({ field, value, rules, data, errors }) {
 }
 async function nestedValidation({ value, segments, rules, fieldPath, data, errors }) {
     if (segments.length === 0) {
-        await checkRules({
-            field: fieldPath,
-            value,
-            rules,
-            data,
-            errors
-        });
+        await checkRules({ field: fieldPath, value, rules, data, errors });
         return;
     }
     const [segment, ...rest] = segments;
@@ -196,25 +203,11 @@ async function nestedValidation({ value, segments, rules, fieldPath, data, error
             return;
         }
         for (let i = 0; i < value.length; i++) {
-            await nestedValidation({
-                value: value[i],
-                segments: rest,
-                rules,
-                fieldPath: `${fieldPath}.${i}`,
-                data,
-                errors
-            });
+            await nestedValidation({ value: value[i], segments: rest, rules, fieldPath: `${fieldPath}.${i}`, data, errors });
         }
     }
     else {
-        await nestedValidation({
-            value: value?.[segment],
-            segments: rest,
-            rules,
-            fieldPath: fieldPath ? `${fieldPath}.${segment}` : segment,
-            data,
-            errors
-        });
+        await nestedValidation({ value: value?.[segment], segments: rest, rules, fieldPath: fieldPath ? `${fieldPath}.${segment}` : segment, data, errors });
     }
 }
 // ==================================>
@@ -228,9 +221,8 @@ function getNestedValue(obj, path) {
         .replace(/\['([^']+)'\]/g, '.$1')
         .replace(/\["([^"]+)"\]/g, '.$1');
     return normalizedPath.split('.').reduce((acc, key) => {
-        if (acc && Object.prototype.hasOwnProperty.call(acc, key)) {
+        if (acc && Object.prototype.hasOwnProperty.call(acc, key))
             return acc[key];
-        }
         return undefined;
     }, obj);
 }

package/dist/validation/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation/validation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@skalfa/skalfa-api-core",
-  "version": "1.0.3",
-  "description": "Core utility functions for Skalfa API framework.",
+  "version": "1.0.8",
+  "description": "Core framework engine and foundational utilities for the Skalfa API backend.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -15,11 +15,11 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "@skalfa/skalfa-orm": "file:../skalfa-orm",
+    "@skalfa/skalfa-orm": "^1.0.0",
     "bcrypt": "^6.0.0",
     "commander": "^12.1.0",
     "dotenv": "^17.2.2",
-    "elysia": "latest",
+    "elysia": "^1.2.0",
     "nodemailer": "^7.0.9",
     "validator": "^13.15.15"
   },

package/src/auth/auth.ts

@@ -1,282 +1,51 @@
-import crypto from 'crypto'
-import bcrypt from "bcrypt";
-import { db } from '@skalfa/skalfa-orm'
-import { registry } from '@utils/registry'
-
-// =====================================>
-// ## Auth: User Access Token
-// =====================================>
-const TOKEN_PLAIN_LENGTH  =  20
-const AUTH_PERMISSION     =  process.env.AUTH_CACHE  ===  "true"
-const AUTH_CACHE          =  process.env.AUTH_CACHE  ===  "true"
-const AUTH_CACHE_TTL      =  Number(process.env.AUTH_CACHE_TTL || 600)
+import { createAccessToken } from './create-access-token'
+import { revokeAccessToken } from './revoke-access-token'
+import { verifyAccessToken } from './verify-access-token'
+import { createUserMailToken } from './create-user-mail-token'
+import { verifyUserMailToken } from './verify-user-mail-token'
+import { listUserSessions } from './list-user-sessions'
+import { revalidateUserPermissions } from './revalidate-user-permissions'
+import { revalidateUserPermissionsByRole } from './revalidate-user-permissions-by-role'
+
+export const TOKEN_PLAIN_LENGTH  =  20
+export const AUTH_PERMISSION     =  process.env.AUTH_CACHE  ===  "true"
+export const AUTH_CACHE          =  process.env.AUTH_CACHE  ===  "true"
+export const AUTH_CACHE_TTL      =  Number(process.env.AUTH_CACHE_TTL || 600)
 
 export const auth = {
-
   // =====================================>
   // ## Auth: create access token with user id
   // =====================================>
-  async createAccessToken(userId: number, req: Request, permission: boolean = true) {
-    const plain  =  crypto.randomBytes(TOKEN_PLAIN_LENGTH).toString("hex")
-    const hash   =  await bcrypt.hash(plain, 10)
-    const agent  =  generateAgentId(req)
-
-    if (!db) {
-      // get user from db (fallback / stub for no ORM)
-      return {
-        token: `1|${plain}`,
-        tokenId: 1,
-      }
-    }
-
-    let permissions: string[] = []
-    if (AUTH_PERMISSION && permission) {
-      permissions = await getUserPermissions(userId)
-    }
-
-    const [row] = await db("user_access_tokens").insert({
-      user_id      :  userId,
-      token        :  hash,
-      agent        :  agent,
-      permissions  :  JSON.stringify(permissions),
-      created_at   :  new Date(),
-    }).returning(["id"])
-
-    return {
-      token    :  `${row.id}|${plain}`,
-      tokenId  :  row.id,
-    }
-  },
+  createAccessToken,
 
   // =====================================>
   // ## Auth: delete access token with user id
   // =====================================>
-  async revokeAccessToken(id: number) {
-    if (!db) {
-      // delete user access token from db (stub for no ORM)
-      return;
-    }
-    return db.table('user_access_tokens').where("id", id).delete()
-  },
+  revokeAccessToken,
 
   // =====================================>
   // ## Auth: verify access token
   // =====================================>
-  async verifyAccessToken(token: string, req?: Request) {
-    if (!token.includes("|")) return null
-
-    const [tokenId, plain]  =  token.split("|", 2)
-    const agent             =  req ? generateAgentId(req) : ""
-    const ip                =  req ? getRequestIp(req) : ""
-
-    const cacheKey = `auth:token:${tokenId}`
-
-    if (AUTH_CACHE) {
-      const redis = registry.get('redis')
-      if (redis) {
-        const cached = await redis.get(cacheKey)
-        if (cached) {
-          const session = JSON.parse(cached)
-          if (session.agent !== agent) return null
-          return session
-        }
-      }
-    }
-
-    if (!db) {
-      // get user and token from db (stub for no ORM)
-      const user = { id: 1, name: "Admin", email: "admin@example.com" }
-      const tokenRecord = { id: Number(tokenId), agent, permission: [] }
-      return { user, token: tokenRecord, permissions: [] }
-    }
-
-    const tokenRecord = await db("user_access_tokens").where("id", tokenId).first()
-
-    if (!tokenRecord) return null
-    if (tokenRecord.agent !== agent) return null
-
-    const valid = await bcrypt.compare(plain, tokenRecord.token)
-    if (!valid) return null
-
-    await db("user_access_tokens").where("id", tokenRecord.id).update({ last_used_at: new Date(), last_used_ip: ip })
-
-    const user = await db("users").where("id", tokenRecord.user_id).first()
-
-    if (AUTH_CACHE) {
-      const redis = registry.get('redis')
-      if (redis) {
-        await redis.setex(
-          cacheKey,
-          AUTH_CACHE_TTL,
-          JSON.stringify({
-            user         :  user,
-            agent        :  tokenRecord.agent,
-            permissions  :  tokenRecord.permission,
-          })
-        )
-      }
-    }
-
-    return { user, token: tokenRecord, permissions: tokenRecord.permission }
-  },
+  verifyAccessToken,
 
   // =====================================>
   // ## Auth: create user mail token
   // =====================================>
-  async createUserMailToken(userId: number) {
-    const token = Math.floor(100000 + Math.random() * 900000).toString()
-    
-    if (!db) {
-      // create user mail token in db (stub for no ORM)
-      return {
-        token: token,
-        tokenId: 1
-      }
-    }
-
-    const hash = crypto.createHash('sha256').update(token).digest('hex')
-    const trx = await db.transaction()
-
-    await trx.table('user_mail_tokens').insert({
-      user_id     : userId,
-      token       : hash,
-      created_at  : new Date(),
-    })
-    
-    const record = await trx.table('user_mail_tokens').orderBy('id', 'desc').first()
-    
-    await trx.commit()
-
-    return {
-      token    : token,
-      tokenId  : record.id
-    }
-  },
+  createUserMailToken,
 
   // =====================================>
   // ## Auth: Verify user mail token
   // =====================================>
-  async verifyUserMailToken(userId: number, token: string) {
-    if (!db) {
-      // verify user mail token in db (stub for no ORM)
-      return true
-    }
-
-    const hashedToken = crypto.createHash("sha256").update(token).digest("hex");
-
-    const record = await db.table("user_mail_tokens")
-      .where("user_id", userId)
-      .whereNull("used_at")
-      .orderBy("id", "desc")
-      .first();
-
-    if (!record) return false
-
-    if (record.token !== hashedToken) return false;
-
-    const createdAt = new Date(record.created_at);
-    const now = new Date();
-    const diffMinutes = (now.getTime() - createdAt.getTime()) / (1000 * 60);
-
-    if (diffMinutes > 10) return false;
-
-    return true;
-  },
+  verifyUserMailToken,
 
   // =====================================>
   // ## Auth: list user sessions
   // =====================================>
-  async listUserSessions(userId: number, currentTokenId?: number) {
-    if (!db) {
-      // list user sessions from db (stub for no ORM)
-      return []
-    }
-
-    const rows = await db("user_access_tokens").select(["id", "agent", "created_at", "last_used_at", "last_used_ip","expired_at"]).where("user_id", userId).orderBy("last_used_at", "desc")
-
-    return rows.map((r: any) => ({
-      ...r,
-      is_active  : r.revoked_at  ===  null,
-      is_current : r.id          ===  currentTokenId,
-    }))
-  },
+  listUserSessions,
 
   // =====================================>
   // ## Auth: revalidate user permission
   // =====================================>
-  revalidateUserPermissions: revalidateUserPermissions,
-  revalidateUserPermissionsByRole: revalidateUserPermissionsByRole,
-}
-
-function generateAgentId(req: Request) {
-  const ua   =  req.headers.get("user-agent")  ??  ""
-  const acc  =  req.headers.get("accept")      ??  ""
-
-  return crypto.createHash("sha256").update(ua + acc).digest("hex")
-}
-
-function getRequestIp(req: Request) {
-  return (req.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || req.headers.get("x-real-ip") || "unknown")
-}
-
-async function getUserPermissions(userId: number): Promise<string[]> {
-  if (!db) {
-    // get user permissions from db (stub for no ORM)
-    return []
-  }
-
-  const roleIds = await db("user_roles").where("user_id", userId).pluck("role_id")
-
-  if (roleIds.length === 0) return []
-
-  const rows = await db("permissions").whereIn("role_id", roleIds).pluck("permissions")
-
-  return Array.from(
-    new Set(
-      rows.flatMap((p: any) => p ?? [])
-    )
-  )
-}
-
-async function revalidateUserPermissions(userId: number) {
-  if (!db) {
-    // revalidate user permissions in db (stub for no ORM)
-    return
-  }
-
-  const permissions = await getUserPermissions(userId)
-
-  const tokenIds = await db("user_access_tokens").where("user_id", userId).pluck("id")
-
-  if (tokenIds.length === 0) return
-
-  await db("user_access_tokens").whereIn("id", tokenIds).update({
-    permissions  :  JSON.stringify(permissions),
-    updated_at   :  new Date(),
-  })
-
-  if (AUTH_CACHE) {
-    const redis = registry.get('redis')
-    if (redis) {
-      await Promise.all(
-        tokenIds.map((id: any) => redis.del(`auth:token:${id}`))
-      )
-    }
-  }
-}
-
-async function revalidateUserPermissionsByRole(roleId: number) {
-  if (!db) {
-    // revalidate user permissions by role in db (stub for no ORM)
-    return
-  }
-
-  const userIds = await db("user_roles").where("role_id", roleId).pluck("user_id")
-
-  const queue = registry.get('queue')
-  if (queue) {
-    for (const userId of userIds) {
-      await queue.add("auth:revalidate-permission", { userId })
-    }
-  }
+  revalidateUserPermissions,
+  revalidateUserPermissionsByRole,
 }

package/src/auth/create-access-token.ts

@@ -0,0 +1,29 @@
+import crypto from 'crypto'
+import bcrypt from "bcrypt";
+import { db } from '@skalfa/skalfa-orm'
+import { TOKEN_PLAIN_LENGTH, AUTH_PERMISSION } from './auth'
+import { getUserPermissions, generateAgentId } from './helpers'
+
+export async function createAccessToken(userId: number, req: Request, permission: boolean = true) {
+  const plain  =  crypto.randomBytes(TOKEN_PLAIN_LENGTH).toString("hex")
+  const hash   =  await bcrypt.hash(plain, 10)
+  const agent  =  generateAgentId(req)
+
+  let permissions: string[] = []
+  if (AUTH_PERMISSION && permission) {
+    permissions = await getUserPermissions(userId)
+  }
+
+  const [row] = await db("user_access_tokens").insert({
+    user_id      :  userId,
+    token        :  hash,
+    agent        :  agent,
+    permissions  :  JSON.stringify(permissions),
+    created_at   :  new Date(),
+  }).returning(["id"])
+
+  return {
+    token    :  `${row.id}|${plain}`,
+    tokenId  :  row.id,
+  }
+}

package/src/auth/create-user-mail-token.ts

@@ -0,0 +1,24 @@
+import crypto from 'crypto'
+import { db } from '@skalfa/skalfa-orm'
+
+export async function createUserMailToken(userId: number) {
+  const token = Math.floor(100000 + Math.random() * 900000).toString()
+
+  const hash = crypto.createHash('sha256').update(token).digest('hex')
+  const trx = await db.transaction()
+
+  await trx.table('user_mail_tokens').insert({
+    user_id     : userId,
+    token       : hash,
+    created_at  : new Date(),
+  })
+  
+  const record = await trx.table('user_mail_tokens').orderBy('id', 'desc').first()
+  
+  await trx.commit()
+
+  return {
+    token    : token,
+    tokenId  : record.id
+  }
+}

package/src/auth/helpers/generate-agent-id.ts

@@ -0,0 +1,8 @@
+import crypto from 'crypto'
+
+export function generateAgentId(req: Request) {
+  const ua   =  req.headers.get("user-agent")  ??  ""
+  const acc  =  req.headers.get("accept")      ??  ""
+
+  return crypto.createHash("sha256").update(ua + acc).digest("hex")
+}

package/src/auth/helpers/get-request-ip.ts

@@ -0,0 +1,3 @@
+export function getRequestIp(req: Request) {
+  return (req.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || req.headers.get("x-real-ip") || "unknown")
+}