@avleon/core 0.0.43 → 0.0.45

package/README.md

@@ -38,6 +38,7 @@ Avleon is a powerful, TypeScript-based web framework built on top of Fastify, de
   - [mapPut](#mapput)
   - [mapDelete](#mapdelete)
 - [Testing](#testing)
+- [WebSocket](#websocket-intregation-socketio)
 
 ## Features
 
@@ -68,7 +69,6 @@ pnpm dlx @avleon/cli new myapp
 ## Quick Start
 
 ### Minimal
-
 ```typescript
 import { Avleon } from "@avleon/core";
 
@@ -78,7 +78,6 @@ app.run(); // or app.run(3000);
 ```
 
 ### Controller Based
-
 ```typescript
 import { Avleon, ApiController, Get, Results } from "@avleon/core";
 
@@ -100,7 +99,6 @@ app.run();
 ## Core Concepts
 
 ### Application Creation
-
 Avleon provides a builder pattern for creating applications:
 
 ```typescript
@@ -118,7 +116,6 @@ app.run(); // or app.run(port)
 ```
 
 ### Controllers
-
 Controllers are the entry points for your API requests. They are defined using the `@ApiController` decorator:
 
 ```typescript
@@ -129,7 +126,6 @@ class UserController {
 ```
 
 ### Route Methods
-
 Define HTTP methods using decorators:
 
 ```typescript
@@ -155,7 +151,6 @@ async deleteUser(@Param('id') id: string) {
 ```
 
 ### Parameter Decorators
-
 Extract data from requests using parameter decorators:
 
 ```typescript
@@ -190,7 +185,6 @@ async uploadFiles(
 ``` -->
 
 ### Error Handling
-
 Return standardized responses using the `HttpResponse` and `HttpExceptions` class:
 
 ```typescript
@@ -207,7 +201,6 @@ async getUser(@Param('id') id: string) {
 ```
 
 ### Middleware
-
 Create and apply middleware for cross-cutting concerns:
 
 ```typescript
@@ -240,7 +233,6 @@ class UserController {
 ```
 
 ### Authentication & Authorization
-
 Secure your API with authentication and authorization:
 
 ```typescript
@@ -293,7 +285,6 @@ class AdminController {
 ```
 
 ### Validation
-
 Validate request data using class-validator:
 
 ```typescript
@@ -340,7 +331,6 @@ class UserDto {
 ```
 
 ### OpenAPI Documentation
-
 Generate API documentation automatically:
 
 ```typescript 
@@ -376,7 +366,6 @@ app.useOpenApi(OpenApiConfig, (config) => {
 ### Database Integration
 
 ## 1. Knex
-
 ```typescript
 const app = Avleon.createApplication();
 app.useKnex({
@@ -417,7 +406,6 @@ app.useKenx(KnexConfig)
 ```
 
 ### Exmaple uses
-
 ```typescript
 import { DB, AppService } from "@avleon/core";
 
@@ -505,7 +493,6 @@ export class UserService {
 ```
 
 ### File Uploads & File Storage
-
 Handle file uploads with multipart support:
 
 ```typescript
@@ -555,7 +542,6 @@ async uploadSingleFile(@UploadFile('file') file: MultipartFile) {
 ```
 
 ### Static Files
-
 Serve static files:
 
 ```typescript
@@ -569,15 +555,12 @@ app.useStaticFiles({
 ```
 
 ## Configuration
-
 Coming soon...
 
 ## Route Mapping
-
 Avleon provides several methods for mapping routes in your application:
 
 ### mapGet
-
 The `mapGet` method is used to define GET routes in your application. It takes a path string and a handler function as parameters.
 
 ```typescript
@@ -588,7 +571,6 @@ app.mapGet("/users", async (req, res) => {
 ```
 
 ### mapPost
-
 The `mapPost` method is used to define POST routes in your application. It takes a path string and a handler function as parameters.
 
 ```typescript
@@ -601,7 +583,6 @@ app.mapPost("/users", async (req, res) => {
 ```
 
 ### mapPut
-
 The `mapPut` method is used to define PUT routes in your application. It takes a path string and a handler function as parameters.
 
 ```typescript
@@ -615,7 +596,6 @@ app.mapPut("/users/:id", async (req, res) => {
 ```
 
 ### mapDelete
-
 The `mapDelete` method is used to define DELETE routes in your application. It takes a path string and a handler function as parameters.
 
 ```typescript
@@ -628,7 +608,6 @@ app.mapDelete("/users/:id", async (req, res) => {
 ```
 
 ### Add openapi and middleware support for inline route
-
 Each of these methods returns a route object that can be used to add middleware or Swagger documentation to the route.
 
 ```typescript
@@ -662,6 +641,30 @@ app
     },
   });
 ```
+### Websocket Intregation (Socket.io)
+```typescript
+app.useSocketIO({
+  cors:{origin:"*"}
+})
+```
+Now in controller or service use EventDispatcher
+
+
+```typescript
+export class UserService{
+  constructor(
+    private readonly dispatcher: EventDispatcher
+  )
+
+  async create(){
+    ...rest code
+
+    await this.dispatcher.dispatch("users:notifications",{created:true, userId: newUser.Id})
+  }
+  
+}
+```
+
 
 ### Testing
 

package/dist/helpers.d.ts

@@ -31,4 +31,14 @@ type ValidationError = {
 export declare function validateRequestBody(target: Constructor, value: object, options?: "object" | "array"): ValidationError;
 export declare function pick<T extends object>(obj: T, paths: string[]): Partial<T>;
 export declare function exclude<T extends object>(obj: T | T[], paths: string[]): Partial<T> | Partial<T>[];
+export declare function autoCast(value: any, typeHint?: any, schema?: any): any;
+/**
+ * Deeply normalizes query strings into nested JS objects.
+ * Supports:
+ *  - filter[name]=john
+ *  - filter[user][age]=25
+ *  - filter[tags][]=a&filter[tags][]=b
+ *  - filter=name&filter=sorna
+ */
+export declare function normalizeQueryDeep(query: Record<string, any>): Record<string, any>;
 export {};

package/dist/helpers.js

@@ -21,6 +21,8 @@ exports.validateObjectByInstance = validateObjectByInstance;
 exports.validateRequestBody = validateRequestBody;
 exports.pick = pick;
 exports.exclude = exclude;
+exports.autoCast = autoCast;
+exports.normalizeQueryDeep = normalizeQueryDeep;
 /**
  * @copyright 2024
  * @author Tareq Hossain
@@ -290,3 +292,128 @@ function exclude(obj, paths) {
     }
     return clone;
 }
+function autoCast(value, typeHint, schema) {
+    var _a, _b;
+    if (value === null || value === undefined)
+        return value;
+    if (Array.isArray(value)) {
+        const elementType = Array.isArray(typeHint) ? typeHint[0] : undefined;
+        return value.map((v) => autoCast(v, elementType));
+    }
+    if (typeof value === "object" && !(value instanceof Date)) {
+        const result = {};
+        for (const [key, val] of Object.entries(value)) {
+            let fieldType = undefined;
+            if ((_b = (_a = schema === null || schema === void 0 ? void 0 : schema.properties) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.type) {
+                const t = schema.properties[key].type;
+                fieldType =
+                    t === "integer" || t === "number"
+                        ? Number
+                        : t === "boolean"
+                            ? Boolean
+                            : t === "array"
+                                ? Array
+                                : t === "object"
+                                    ? Object
+                                    : String;
+            }
+            result[key] = autoCast(val, fieldType);
+        }
+        return result;
+    }
+    if (typeof value !== "string")
+        return value;
+    const trimmed = value.trim();
+    if (typeHint === Boolean || trimmed.toLowerCase() === "true")
+        return true;
+    if (trimmed.toLowerCase() === "false")
+        return false;
+    if (typeHint === Number || (!isNaN(Number(trimmed)) && trimmed !== "")) {
+        const n = Number(trimmed);
+        if (!isNaN(n))
+            return n;
+    }
+    if ((trimmed.startsWith("{") && trimmed.endsWith("}")) ||
+        (trimmed.startsWith("[") && trimmed.endsWith("]"))) {
+        try {
+            const parsed = JSON.parse(trimmed);
+            return autoCast(parsed, typeHint, schema);
+        }
+        catch (_c) {
+            return trimmed;
+        }
+    }
+    if (typeHint === Date ||
+        /^\d{4}-\d{2}-\d{2}([Tt]\d{2}:\d{2})?/.test(trimmed)) {
+        const d = new Date(trimmed);
+        if (!isNaN(d.getTime()))
+            return d;
+    }
+    return trimmed;
+}
+/**
+ * Deeply normalizes query strings into nested JS objects.
+ * Supports:
+ *  - filter[name]=john
+ *  - filter[user][age]=25
+ *  - filter[tags][]=a&filter[tags][]=b
+ *  - filter=name&filter=sorna
+ */
+function normalizeQueryDeep(query) {
+    const result = {};
+    const setDeep = (obj, path, value) => {
+        let current = obj;
+        for (let i = 0; i < path.length; i++) {
+            const key = path[i];
+            const nextKey = path[i + 1];
+            if (i === path.length - 1) {
+                if (key === "") {
+                    if (!Array.isArray(current))
+                        current = [];
+                    current.push(value);
+                }
+                else if (Array.isArray(current[key])) {
+                    current[key].push(value);
+                }
+                else if (current[key] !== undefined) {
+                    current[key] = [current[key], value];
+                }
+                else {
+                    current[key] = value;
+                }
+            }
+            else {
+                if (!current[key]) {
+                    current[key] = nextKey === "" || /^\d+$/.test(nextKey) ? [] : {};
+                }
+                current = current[key];
+            }
+        }
+    };
+    for (const [rawKey, rawValue] of Object.entries(query)) {
+        const path = [];
+        const regex = /([^\[\]]+)|(\[\])/g;
+        let match;
+        while ((match = regex.exec(rawKey)) !== null) {
+            if (match[1])
+                path.push(match[1]);
+            else if (match[2])
+                path.push("");
+        }
+        if (path.length === 0) {
+            if (result[rawKey]) {
+                if (Array.isArray(result[rawKey]))
+                    result[rawKey].push(rawValue);
+                else
+                    result[rawKey] = [result[rawKey], rawValue];
+            }
+            else {
+                result[rawKey] = rawValue;
+            }
+        }
+        else {
+            setDeep(result, path, rawValue);
+        }
+    }
+    return result;
+}

package/dist/icore.js

@@ -503,29 +503,25 @@ class AvleonApplication {
         // Initialize args array with correct length
         const maxIndex = Math.max(...meta.params.map((p) => p.index || 0), ...meta.query.map((q) => q.index), ...meta.body.map((b) => b.index), ...meta.currentUser.map((u) => u.index), ...meta.headers.map((h) => h.index), ...(((_a = meta.request) === null || _a === void 0 ? void 0 : _a.map((r) => r.index)) || []), ...(((_b = meta.file) === null || _b === void 0 ? void 0 : _b.map((f) => f.index)) || []), ...(((_c = meta.files) === null || _c === void 0 ? void 0 : _c.map((f) => f.index)) || []), -1) + 1;
         const args = new Array(maxIndex).fill(undefined);
-        // Map route parameters
         meta.params.forEach((p) => {
-            args[p.index] =
-                p.key == "all" ? { ...req.query } : req.params[p.key] || null;
+            var _a;
+            const raw = p.key === "all" ? { ...req.params } : ((_a = req.params[p.key]) !== null && _a !== void 0 ? _a : null);
+            args[p.index] = (0, helpers_1.autoCast)(raw, p.dataType, p.schema);
         });
-        // Map query parameters
         meta.query.forEach((q) => {
-            args[q.index] = q.key == "all" ? { ...req.query } : req.query[q.key];
+            const raw = q.key === "all" ? (0, helpers_1.normalizeQueryDeep)({ ...req.query }) : req.query[q.key];
+            args[q.index] = (0, helpers_1.autoCast)(raw, q.dataType, q.schema);
         });
-        // Map body data (including form data)
         meta.body.forEach((body) => {
             args[body.index] = { ...req.body, ...req.formData };
         });
-        // Map current user
         meta.currentUser.forEach((user) => {
             args[user.index] = req.user;
         });
-        // Map headers
         meta.headers.forEach((header) => {
             args[header.index] =
                 header.key === "all" ? { ...req.headers } : req.headers[header.key];
         });
-        // Map request object
         if (meta.request && meta.request.length > 0) {
             meta.request.forEach((r) => {
                 args[r.index] = req;
@@ -538,11 +534,9 @@ class AvleonApplication {
             ((_d = req.headers["content-type"]) === null || _d === void 0 ? void 0 : _d.startsWith("multipart/form-data"))) {
             const files = await req.saveRequestFiles();
             if (!files || files.length === 0) {
-                // Only throw error if files are explicitly required
                 if (meta.files && meta.files.length > 0) {
                     throw new exceptions_1.BadRequestException({ error: "No files uploaded" });
                 }
-                // For single file (@File()), set to null
                 if (meta.file && meta.file.length > 0) {
                     meta.file.forEach((f) => {
                         args[f.index] = null;
@@ -550,7 +544,6 @@ class AvleonApplication {
                 }
             }
             else {
-                // Create file info objects
                 const fileInfo = files.map((file) => ({
                     type: file.type,
                     filepath: file.filepath,
@@ -559,16 +552,14 @@ class AvleonApplication {
                     encoding: file.encoding,
                     mimetype: file.mimetype,
                     fields: file.fields,
+                    toBuffer: file.toBuffer,
                 }));
-                // Handle single file decorator (@File())
                 if (meta.file && meta.file.length > 0) {
                     meta.file.forEach((f) => {
                         if (f.fieldName === "all") {
-                            // Return first file if "all" is specified
                             args[f.index] = fileInfo[0] || null;
                         }
                         else {
-                            // Find specific file by fieldname
                             const file = fileInfo.find((x) => x.fieldname === f.fieldName);
                             if (!file) {
                                 throw new exceptions_1.BadRequestException(`File field "${f.fieldName}" not found in uploaded files`);
@@ -594,12 +585,10 @@ class AvleonApplication {
             }
         }
         else if (needsFiles) {
-            // Files expected but request is not multipart/form-data
             throw new exceptions_1.BadRequestException({
                 error: "Invalid content type. Expected multipart/form-data for file uploads",
             });
         }
-        // Cache the result
         cache.set(cacheKey, args);
         return args;
     }
@@ -830,6 +819,7 @@ class AvleonApplication {
             return reply.status(500).send({
                 code: 500,
                 message: error.message || "Internal Server Error",
+                ...(process.env.NODE_ENV === "development" && { stack: error.stack }),
             });
         });
         await this.app.ready();

package/dist/params.js

@@ -13,45 +13,47 @@ const swagger_schema_1 = require("./swagger-schema");
 function createParamDecorator(type) {
     return function (key, options = {}) {
         return function (target, propertyKey, parameterIndex) {
-            var _a;
-            const existingParams = Reflect.getMetadata(type, target, propertyKey) || [];
-            const parameterTypes = Reflect.getMetadata("design:paramtypes", target, propertyKey) || [];
-            const functionSource = target[propertyKey].toString();
-            const paramNames = (_a = functionSource
-                .match(/\(([^)]*)\)/)) === null || _a === void 0 ? void 0 : _a[1].split(",").map((name) => name.trim());
-            const paramDataType = parameterTypes[parameterIndex];
-            existingParams.push({
-                index: parameterIndex,
-                key: key ? key : "all",
-                name: paramNames[parameterIndex],
-                required: options.required == undefined ? true : options.required,
-                validate: options.validate == undefined ? true : options.validate,
-                dataType: (0, helpers_1.getDataType)(paramDataType),
-                validatorClass: (0, helpers_1.isClassValidatorClass)(paramDataType),
-                schema: (0, helpers_1.isClassValidatorClass)(paramDataType)
-                    ? (0, swagger_schema_1.generateSwaggerSchema)(paramDataType)
-                    : null,
-                type,
-            });
+            var _a, _b, _c, _d;
+            let metaKey;
             switch (type) {
                 case "route:param":
-                    Reflect.defineMetadata(container_1.PARAM_META_KEY, existingParams, target, propertyKey);
+                    metaKey = container_1.PARAM_META_KEY;
                     break;
                 case "route:query":
-                    Reflect.defineMetadata(container_1.QUERY_META_KEY, existingParams, target, propertyKey);
+                    metaKey = container_1.QUERY_META_KEY;
                     break;
                 case "route:body":
-                    Reflect.defineMetadata(container_1.REQUEST_BODY_META_KEY, existingParams, target, propertyKey);
+                    metaKey = container_1.REQUEST_BODY_META_KEY;
                     break;
                 case "route:user":
-                    Reflect.defineMetadata(container_1.REQUEST_USER_META_KEY, existingParams, target, propertyKey);
+                    metaKey = container_1.REQUEST_USER_META_KEY;
                     break;
                 case "route:header":
-                    Reflect.defineMetadata(container_1.REQUEST_HEADER_META_KEY, existingParams, target, propertyKey);
+                    metaKey = container_1.REQUEST_HEADER_META_KEY;
                     break;
                 default:
-                    break;
+                    throw new Error(`Unknown param decorator type: ${String(type)}`);
             }
+            const existingParams = Reflect.getMetadata(metaKey, target, propertyKey) || [];
+            // Get parameter names (fallback safe)
+            const functionSource = target[propertyKey].toString();
+            const paramNames = ((_b = (_a = functionSource.match(/\(([^)]*)\)/)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.split(",").map((n) => n.trim())) || [];
+            const parameterTypes = Reflect.getMetadata("design:paramtypes", target, propertyKey) || [];
+            const paramDataType = parameterTypes[parameterIndex];
+            existingParams.push({
+                index: parameterIndex,
+                key: typeof key === "string" ? key : "all",
+                name: paramNames[parameterIndex],
+                required: (_c = options.required) !== null && _c !== void 0 ? _c : true,
+                validate: (_d = options.validate) !== null && _d !== void 0 ? _d : true,
+                dataType: (0, helpers_1.getDataType)(paramDataType),
+                validatorClass: (0, helpers_1.isClassValidatorClass)(paramDataType),
+                schema: (0, helpers_1.isClassValidatorClass)(paramDataType)
+                    ? (0, swagger_schema_1.generateSwaggerSchema)(paramDataType)
+                    : null,
+                type,
+            });
+            Reflect.defineMetadata(metaKey, existingParams, target, propertyKey);
         };
     };
 }

package/dist/queue.d.ts

@@ -1,38 +1,29 @@
-import { EventEmitter } from "events";
-interface Job {
-    id: string;
-    data: any;
-    runAt?: number;
-    status?: "pending" | "running" | "failed" | "completed";
+import Bull, { Queue as BullQueue, Job, JobOptions } from 'bull';
+export interface QueueConfig {
+    name: string;
+    adapter?: any;
+    handler?: (job: Job) => Promise<any>;
+    options?: Bull.QueueOptions;
 }
-interface QueueAdapter {
-    loadJobs(): Promise<Job[]>;
-    saveJobs(jobs: Job[]): Promise<void>;
+export declare class AvleonQueue<T = any> {
+    protected name?: string | undefined;
+    protected adapter?: any | undefined;
+    protected queue: BullQueue<T>;
+    protected handlerFn?: (job: Job<T>) => Promise<any>;
+    constructor(name?: string | undefined, adapter?: any | undefined, handler?: (job: Job<T>) => Promise<any>);
+    handler?(job: Job<T>): Promise<any> | any;
+    add(data: T, options?: JobOptions): Promise<Bull.Job<T>>;
+    delay(data: T, delayMs: number, options?: JobOptions): Promise<Bull.Job<T>>;
+    process(handler: (job: Job<T>) => Promise<any>): void;
+    processConcurrent(concurrency: number, handler: (job: Job<T>) => Promise<any>): void;
+    getQueue(): BullQueue<T>;
+    clean(grace: number, status?: 'completed' | 'wait' | 'active' | 'delayed' | 'failed'): Promise<Job[]>;
+    close(): Promise<void>;
+    pause(): Promise<void>;
+    resume(): Promise<void>;
+    getJob(jobId: string): Promise<Job<T> | null>;
+    getJobs(types: Array<'completed' | 'waiting' | 'active' | 'delayed' | 'failed' | 'paused'>, start?: number, end?: number): Promise<Job<T>[]>;
 }
-export declare class FileQueueAdapter implements QueueAdapter {
-    private queueFile;
-    constructor(queueName: string);
-    loadJobs(): Promise<Job[]>;
-    saveJobs(jobs: Job[]): Promise<void>;
-}
-export declare class AvleonQueue extends EventEmitter {
-    private name;
-    private processing;
-    private stopped;
-    private jobHandler;
-    private adapter;
-    constructor(name: string, adapter?: QueueAdapter, jobHandler?: (job: Job) => Promise<void>);
-    private defaultHandler;
-    addJob(data: any, options?: {
-        delay?: number;
-    }): Promise<void>;
-    private processNext;
-    onDone(cb: (job: Job) => void): Promise<void>;
-    onFailed(cb: (error: any, job: Job) => void): Promise<void>;
-    getJobs(): Promise<Job[]>;
-    stop(): Promise<void>;
-}
-export declare class QueueManager {
-    from(name: string, jobHandler?: (job: Job) => Promise<void>): Promise<AvleonQueue>;
-}
-export {};
+export declare function Queue(config: QueueConfig): <T extends {
+    new (...args: any[]): AvleonQueue;
+}>(target: T) => T;

package/dist/queue.js

@@ -1,116 +1,84 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueManager = exports.AvleonQueue = exports.FileQueueAdapter = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const crypto_1 = require("crypto");
-const events_1 = require("events");
-const decorators_1 = require("./decorators");
-class FileQueueAdapter {
-    constructor(queueName) {
-        this.queueFile = (0, path_1.join)(__dirname, `${queueName}.json`);
-    }
-    async loadJobs() {
-        try {
-            const data = await fs_1.promises.readFile(this.queueFile, "utf-8");
-            return JSON.parse(data);
+exports.AvleonQueue = void 0;
+exports.Queue = Queue;
+const bull_1 = __importDefault(require("bull"));
+const typedi_1 = require("typedi");
+class AvleonQueue {
+    constructor(name, adapter, handler) {
+        this.name = name;
+        this.adapter = adapter;
+        // Initialize queue with adapter or default Redis connection
+        this.queue = new bull_1.default(name || 'default', adapter);
+        this.handlerFn = handler;
+        // Check if the instance has a handler method defined
+        // This allows subclasses to define handler as a method
+        if (typeof this.handler === 'function' && !this.handlerFn) {
+            this.handlerFn = (job) => this.handler(job);
         }
-        catch (_a) {
-            return [];
+        // If handler is provided (from decorator or class method), set up processing
+        if (this.handlerFn) {
+            this.queue.process(this.handlerFn);
         }
     }
-    async saveJobs(jobs) {
-        await fs_1.promises.writeFile(this.queueFile, JSON.stringify(jobs, null, 2), "utf-8");
+    // Add job to queue
+    add(data, options) {
+        return this.queue.add(data, options);
     }
-}
-exports.FileQueueAdapter = FileQueueAdapter;
-class AvleonQueue extends events_1.EventEmitter {
-    constructor(name, adapter, jobHandler) {
-        super();
-        this.processing = false;
-        this.stopped = false;
-        this.name = name;
-        this.adapter = adapter ? adapter : new FileQueueAdapter(name);
-        this.jobHandler = jobHandler || this.defaultHandler.bind(this);
-        this.setMaxListeners(10);
+    // Add job with delay
+    delay(data, delayMs, options) {
+        return this.queue.add(data, { ...options, delay: delayMs });
     }
-    async defaultHandler(job) {
-        if (typeof job.data === "function") {
-            await job.data();
-        }
+    // Process jobs (can be called manually if not using handler)
+    process(handler) {
+        this.handlerFn = handler;
+        this.queue.process(handler);
     }
-    async addJob(data, options) {
-        const job = {
-            id: (0, crypto_1.randomUUID)(),
-            data,
-            runAt: Date.now() + ((options === null || options === void 0 ? void 0 : options.delay) || 0),
-            status: "pending",
-        };
-        const jobs = await this.adapter.loadJobs();
-        jobs.push(job);
-        await this.adapter.saveJobs(jobs);
-        if (!this.processing)
-            this.processNext();
+    // Process with concurrency
+    processConcurrent(concurrency, handler) {
+        this.handlerFn = handler;
+        this.queue.process(concurrency, handler);
     }
-    async processNext() {
-        if (this.processing || this.stopped)
-            return;
-        this.processing = true;
-        while (!this.stopped) {
-            const jobs = await this.adapter.loadJobs();
-            const nextJob = jobs.find((j) => j.status === "pending");
-            if (!nextJob) {
-                this.processing = false;
-                return;
-            }
-            const now = Date.now();
-            if (nextJob.runAt && nextJob.runAt > now) {
-                const delay = nextJob.runAt - now;
-                await new Promise((res) => setTimeout(res, delay));
-            }
-            nextJob.status = "running";
-            await this.adapter.saveJobs(jobs);
-            this.emit("start", nextJob);
-            try {
-                await this.jobHandler(nextJob);
-                nextJob.status = "completed";
-                this.emit("done", nextJob);
-            }
-            catch (err) {
-                nextJob.status = "failed";
-                this.emit("failed", err, nextJob);
-            }
-            await this.adapter.saveJobs(jobs.filter((j) => j.id !== nextJob.id));
-        }
-        this.processing = false;
+    // Get the underlying Bull queue
+    getQueue() {
+        return this.queue;
+    }
+    async clean(grace, status) {
+        return this.queue.clean(grace, status);
     }
-    async onDone(cb) {
-        this.on("done", cb);
+    async close() {
+        await this.queue.close();
     }
-    async onFailed(cb) {
-        this.on("failed", cb);
+    async pause() {
+        await this.queue.pause();
     }
-    async getJobs() {
-        return this.adapter.loadJobs();
+    async resume() {
+        await this.queue.resume();
     }
-    async stop() {
-        this.stopped = true;
+    async getJob(jobId) {
+        return this.queue.getJob(jobId);
+    }
+    async getJobs(types, start, end) {
+        return this.queue.getJobs(types, start, end);
     }
 }
 exports.AvleonQueue = AvleonQueue;
-let QueueManager = class QueueManager {
-    async from(name, jobHandler) {
-        const q = new AvleonQueue(name, new FileQueueAdapter(name), jobHandler);
-        return q;
-    }
-};
-exports.QueueManager = QueueManager;
-exports.QueueManager = QueueManager = __decorate([
-    decorators_1.AppService
-], QueueManager);
+function Queue(config) {
+    return function (target) {
+        // Create a new class that extends the target
+        const DecoratedClass = class extends target {
+            constructor(...args) {
+                super(config.name, config.adapter, config.handler);
+            }
+        };
+        Object.defineProperty(DecoratedClass, 'name', {
+            value: target.name,
+            writable: false
+        });
+        (0, typedi_1.Service)()(DecoratedClass);
+        return DecoratedClass;
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avleon/core",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "keywords": [
@@ -23,6 +23,7 @@
     "test": "."
   },
   "dependencies": {
+    "bull": "^4.16.5",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
     "fastify": "^5.1.0",

package/dist/queue.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/queue.test.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const queue_1 = require("./queue");
-const fs_1 = require("fs");
-const path_1 = require("path");
-jest.mock("fs", () => ({
-    promises: {
-        readFile: jest.fn(),
-        writeFile: jest.fn(),
-    },
-}));
-const mockQueueFile = (0, path_1.join)(__dirname, "testqueue.json");
-describe("FileQueueAdapter", () => {
-    const jobs = [{ id: "1", data: "foo" }, { id: "2", data: "bar" }];
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-    it("should load jobs from file", async () => {
-        fs_1.promises.readFile.mockResolvedValue(JSON.stringify(jobs));
-        const adapter = new queue_1.FileQueueAdapter("testqueue");
-        const loaded = await adapter.loadJobs();
-        expect(loaded).toEqual(jobs);
-        expect(fs_1.promises.readFile).toHaveBeenCalledWith(mockQueueFile, "utf-8");
-    });
-    it("should return empty array if file does not exist", async () => {
-        fs_1.promises.readFile.mockRejectedValue(new Error("not found"));
-        const adapter = new queue_1.FileQueueAdapter("testqueue");
-        const loaded = await adapter.loadJobs();
-        expect(loaded).toEqual([]);
-    });
-    it("should save jobs to file", async () => {
-        const adapter = new queue_1.FileQueueAdapter("testqueue");
-        await adapter.saveJobs(jobs);
-        expect(fs_1.promises.writeFile).toHaveBeenCalledWith(mockQueueFile, JSON.stringify(jobs, null, 2), "utf-8");
-    });
-});
-describe("QueueManager and SimpleQueue", () => {
-    let adapter;
-    // let queueManager: QueueManager;
-    let handler;
-    // beforeEach(() => {
-    //     jest.clearAllMocks();
-    //     adapter = new FileQueueAdapter("testqueue");
-    //     queueManager = QueueManager.getInstance(adapter);
-    //     handler = jest.fn().mockResolvedValue(undefined);
-    //     (fs.readFile as jest.Mock).mockResolvedValue("[]");
-    //     (fs.writeFile as jest.Mock).mockResolvedValue(undefined);
-    // });
-    // it("should create a queue and add a job", async () => {
-    //     const queue = queueManager.createQueue(handler);
-    //     await queue.addJob({ foo: "bar" });
-    //     expect(fs.readFile).toHaveBeenCalled();
-    //     expect(fs.writeFile).toHaveBeenCalled();
-    // });
-    // it("should process jobs using handler", async () => {
-    //     (fs.readFile as jest.Mock)
-    //         .mockResolvedValueOnce("[]")
-    //         .mockResolvedValueOnce(JSON.stringify([{ id: "1", data: "baz" }]))
-    //         .mockResolvedValueOnce("[]");
-    //     const queue = queueManager.createQueue(handler);
-    //     await queue.addJob("baz");
-    //     expect(handler).toHaveBeenCalled();
-    // });
-    // it("should requeue job if handler throws", async () => {
-    //     handler.mockRejectedValueOnce(new Error("fail"));
-    //     (fs.readFile as jest.Mock)
-    //         .mockResolvedValueOnce("[]")
-    //         .mockResolvedValueOnce(JSON.stringify([{ id: "1", data: "baz" }]))
-    //         .mockResolvedValueOnce(JSON.stringify([{ id: "1", data: "baz" }]));
-    //     const queue = queueManager.createQueue(handler);
-    //     await queue.addJob("baz");
-    //     expect(handler).toHaveBeenCalled();
-    //     expect(fs.writeFile).toHaveBeenCalledTimes(2);
-    // });
-    // it("QueueManager should be singleton", () => {
-    //     const another = QueueManager.getInstance(adapter);
-    //     expect(another).toBe(queueManager);
-    // });
-});