jcc-express-mvc 1.8.7 → 1.8.21

package/lib/Queue/Drivers/RedisDriver.js

@@ -0,0 +1,533 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisDriver = void 0;
+function createRedisClient(config) {
+    const Redis = require("ioredis").default ?? require("ioredis");
+    if (typeof config === "string") {
+        return new Redis(config);
+    }
+    return new Redis(config);
+}
+class RedisDriver {
+    constructor(config) {
+        const connection = config.connection ?? "redis://127.0.0.1:6379";
+        this.redis = createRedisClient(connection);
+        this.prefix = config.prefix ?? "queue";
+        this.defaultQueue = config.queue ?? "default";
+        this.blockFor = config.blockFor ?? 5;
+    }
+    listKey(queue) {
+        return `${this.prefix}:${queue}`;
+    }
+    delayedKey(queue) {
+        return `${this.prefix}:${queue}:delayed`;
+    }
+    failedKey() {
+        return `${this.prefix}:failed`;
+    }
+    completedKey() {
+        return `${this.prefix}:completed`;
+    }
+    metaKey(jobId) {
+        return `${this.prefix}:meta:${jobId}`;
+    }
+    dataKey(jobId) {
+        return `${this.prefix}:data:${jobId}`;
+    }
+    serializeJob(job) {
+        return JSON.stringify({
+            ...job,
+            status: job.status ?? "pending",
+            payload: typeof job.payload === "string"
+                ? job.payload
+                : JSON.stringify(job.payload),
+        });
+    }
+    deserializeJob(serialized) {
+        try {
+            const parsed = JSON.parse(serialized);
+            const payload = typeof parsed.payload === "string"
+                ? parsed.payload
+                : JSON.stringify(parsed.payload);
+            return {
+                id: parsed.id,
+                queue: parsed.queue,
+                payload,
+                attempts: parsed.attempts ?? 0,
+                maxAttempts: parsed.maxAttempts ?? 3,
+                timeout: parsed.timeout ?? 60,
+                availableAt: parsed.availableAt
+                    ? new Date(parsed.availableAt)
+                    : new Date(),
+                createdAt: parsed.createdAt ? new Date(parsed.createdAt) : new Date(),
+                status: parsed.status,
+                startedAt: parsed.startedAt ? new Date(parsed.startedAt) : undefined,
+                finishedAt: parsed.finishedAt ? new Date(parsed.finishedAt) : undefined,
+                failedAt: parsed.failedAt ? new Date(parsed.failedAt) : undefined,
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    async push(job, queue) {
+        const key = this.listKey(queue);
+        const serialized = this.serializeJob(job);
+        await this.redis.rpush(key, serialized);
+    }
+    async later(job, delay, queue) {
+        const availableAt = Date.now() + delay * 1000;
+        const key = this.delayedKey(queue);
+        const serialized = this.serializeJob({
+            ...job,
+            availableAt: new Date(availableAt),
+        });
+        await this.redis.zadd(key, availableAt, serialized);
+    }
+    async migrateDelayedJobs(queue) {
+        const now = Date.now();
+        const delayedKey = this.delayedKey(queue);
+        const listKey = this.listKey(queue);
+        const ready = await this.redis.zrangebyscore(delayedKey, 0, now);
+        if (ready.length === 0)
+            return;
+        const pipeline = this.redis.pipeline();
+        for (const serialized of ready) {
+            pipeline.rpush(listKey, serialized);
+        }
+        pipeline.zremrangebyscore(delayedKey, 0, now);
+        await pipeline.exec();
+    }
+    async pop(queue) {
+        await this.migrateDelayedJobs(queue);
+        const key = this.listKey(queue);
+        let serialized;
+        if (this.blockFor > 0) {
+            const result = await this.redis.blpop(key, this.blockFor);
+            serialized = result ? result[1] : null;
+        }
+        else {
+            serialized = await this.redis.lpop(key);
+        }
+        if (!serialized)
+            return null;
+        const job = this.deserializeJob(serialized);
+        if (job) {
+            job.status = "processing";
+            job.startedAt = new Date();
+            const withStatus = {
+                ...job,
+                status: "processing",
+                startedAt: job.startedAt,
+            };
+            await this.redis.set(this.dataKey(job.id), this.serializeJob(withStatus));
+            await this.redis.hset(this.metaKey(job.id), {
+                status: "processing",
+                started_at: String(Date.now()),
+            });
+        }
+        return job;
+    }
+    async delete(jobId) {
+        await this.redis.del(this.metaKey(jobId));
+        await this.redis.del(this.dataKey(jobId));
+        const keys = await this.redis.keys(`${this.prefix}:*`);
+        for (const key of keys) {
+            if (key.endsWith(":delayed") || key === this.failedKey())
+                continue;
+            if ((await this.redis.type(key)) !== "list")
+                continue;
+            const items = await this.redis.lrange(key, 0, -1);
+            for (const s of items) {
+                try {
+                    const parsed = JSON.parse(s);
+                    if (parsed.id === jobId) {
+                        await this.redis.lrem(key, 1, s);
+                        return;
+                    }
+                }
+                catch {
+                    // skip
+                }
+            }
+        }
+        const failedItems = await this.redis.lrange(this.failedKey(), 0, -1);
+        for (const s of failedItems) {
+            try {
+                const parsed = JSON.parse(s);
+                if (parsed.id === jobId) {
+                    await this.redis.lrem(this.failedKey(), 1, s);
+                    return;
+                }
+            }
+            catch {
+                // skip
+            }
+        }
+        const completedItems = await this.redis.lrange(this.completedKey(), 0, -1);
+        for (const s of completedItems) {
+            try {
+                const parsed = JSON.parse(s);
+                if (parsed.id === jobId) {
+                    await this.redis.lrem(this.completedKey(), 1, s);
+                    return;
+                }
+            }
+            catch {
+                // skip
+            }
+        }
+    }
+    async updateStatus(jobId, update) {
+        const meta = { status: update.status };
+        if (update.startedAt)
+            meta.started_at = String(update.startedAt.getTime());
+        if (update.finishedAt)
+            meta.finished_at = String(update.finishedAt.getTime());
+        if (update.failedAt)
+            meta.failed_at = String(update.failedAt.getTime());
+        await this.redis.hset(this.metaKey(jobId), meta);
+        if (update.status === "completed") {
+            let serialized = await this.redis.get(this.dataKey(jobId));
+            // If the job isn't in the data key (e.g. runJob uses push, not pop),
+            // search the queue lists and pull it out.
+            if (!serialized) {
+                const keys = await this.redis.keys(`${this.prefix}:*`);
+                for (const key of keys) {
+                    if (key.endsWith(":delayed") ||
+                        key.includes(":meta:") ||
+                        key.includes(":data:") ||
+                        key === this.failedKey() ||
+                        key === this.completedKey())
+                        continue;
+                    const type = await this.redis.type(key);
+                    if (type !== "list")
+                        continue;
+                    const items = await this.redis.lrange(key, 0, -1);
+                    for (const item of items) {
+                        try {
+                            const parsed = JSON.parse(item);
+                            if (parsed.id === jobId) {
+                                serialized = item;
+                                await this.redis.lrem(key, 1, item);
+                                break;
+                            }
+                        }
+                        catch {
+                            continue;
+                        }
+                    }
+                    if (serialized)
+                        break;
+                }
+            }
+            if (serialized) {
+                const job = this.deserializeJob(serialized);
+                if (job) {
+                    const withFinished = {
+                        ...job,
+                        status: "completed",
+                        finishedAt: update.finishedAt,
+                    };
+                    await this.redis.rpush(this.completedKey(), this.serializeJob(withFinished));
+                }
+                await this.redis.del(this.dataKey(jobId));
+            }
+        }
+        if (update.status === "completed" || update.status === "failed") {
+            await this.redis.del(this.metaKey(jobId));
+        }
+    }
+    async release(job, delay = 0) {
+        if (delay > 0) {
+            await this.later(job, delay / 1000, job.queue);
+        }
+        else {
+            await this.push(job, job.queue);
+        }
+    }
+    async failed(job, error) {
+        const exception = error?.message + "\n" + (error?.stack || "");
+        await this.redis.del(this.dataKey(job.id));
+        await this.redis.del(this.metaKey(job.id));
+        const availableAt = job.availableAt instanceof Date
+            ? job.availableAt.getTime()
+            : typeof job.availableAt === "number"
+                ? job.availableAt
+                : Date.now();
+        const createdAt = job.createdAt instanceof Date
+            ? job.createdAt.getTime()
+            : typeof job.createdAt === "number"
+                ? job.createdAt
+                : Date.now();
+        const failedEntry = JSON.stringify({
+            id: job.id,
+            queue: job.queue,
+            payload: job.payload,
+            attempts: job.attempts,
+            availableAt,
+            createdAt,
+            error: error?.message ?? String(error),
+            stack: error?.stack,
+            exception,
+            failedAt: Date.now(),
+            status: "failed",
+        });
+        await this.redis.rpush(this.failedKey(), failedEntry);
+    }
+    /**
+     * Get all jobs from all queues (pending, processing, completed, failed).
+     * Returns array with status, started_at, finished_at, failed_at.
+     */
+    async getQueues() {
+        const jobs = [];
+        const keys = await this.redis.keys(`${this.prefix}:*`);
+        for (const key of keys) {
+            if (key.endsWith(":delayed") ||
+                key.includes(":meta:") ||
+                key.includes(":data:"))
+                continue;
+            if (key === this.failedKey() || key === this.completedKey())
+                continue;
+            if ((await this.redis.type(key)) !== "list")
+                continue;
+            const queueName = key.replace(`${this.prefix}:`, "");
+            const items = await this.redis.lrange(key, 0, -1);
+            for (const serialized of items) {
+                const job = this.deserializeJob(serialized);
+                if (job) {
+                    jobs.push(this.toJobRecord(job, queueName));
+                }
+            }
+        }
+        const metaKeys = await this.redis.keys(`${this.prefix}:meta:*`);
+        for (const mk of metaKeys) {
+            const jobId = mk.replace(`${this.prefix}:meta:`, "");
+            const serialized = await this.redis.get(this.dataKey(jobId));
+            if (serialized) {
+                const job = this.deserializeJob(serialized);
+                if (job) {
+                    const meta = await this.redis.hgetall(mk);
+                    jobs.push(this.toJobRecord(job, job.queue, meta));
+                }
+            }
+        }
+        const completedItems = await this.redis.lrange(this.completedKey(), 0, -1);
+        for (const serialized of completedItems) {
+            const job = this.deserializeJob(serialized);
+            if (job)
+                jobs.push(this.toJobRecord(job, job.queue));
+        }
+        const failedItems = await this.redis.lrange(this.failedKey(), 0, -1);
+        for (const serialized of failedItems) {
+            try {
+                const parsed = JSON.parse(serialized);
+                jobs.push({
+                    id: parsed.id,
+                    queue: parsed.queue ?? "default",
+                    payload: parsed.payload,
+                    attempts: parsed.attempts ?? 0,
+                    available_at: parsed.availableAt ?? null,
+                    created_at: parsed.createdAt ?? null,
+                    status: "failed",
+                    started_at: null,
+                    finished_at: null,
+                    failed_at: parsed.failedAt ?? null,
+                    exception: parsed.exception ??
+                        (parsed.error ? parsed.error + "\n" + (parsed.stack || "") : null),
+                });
+            }
+            catch {
+                // skip
+            }
+        }
+        return this.sortByLatest(jobs);
+    }
+    sortByLatest(jobs) {
+        return jobs.sort((a, b) => {
+            const tsA = a.finished_at ?? a.failed_at ?? a.created_at ?? 0;
+            const tsB = b.finished_at ?? b.failed_at ?? b.created_at ?? 0;
+            const numA = typeof tsA === "number" ? tsA : tsA?.getTime?.() ?? 0;
+            const numB = typeof tsB === "number" ? tsB : tsB?.getTime?.() ?? 0;
+            return numB - numA;
+        });
+    }
+    toJobRecord(job, queue, meta) {
+        return {
+            id: job.id,
+            queue,
+            payload: job.payload,
+            attempts: job.attempts,
+            available_at: job.availableAt,
+            created_at: job.createdAt,
+            status: meta?.status ?? job.status ?? "pending",
+            started_at: meta?.started_at
+                ? parseInt(meta.started_at, 10)
+                : (job.startedAt?.getTime?.() ?? null),
+            finished_at: meta?.finished_at
+                ? parseInt(meta.finished_at, 10)
+                : (job.finishedAt?.getTime?.() ?? null),
+            failed_at: meta?.failed_at
+                ? parseInt(meta.failed_at, 10)
+                : (job.failedAt?.getTime?.() ?? null),
+            exception: meta?.exception ?? null,
+        };
+    }
+    /**
+     * Find a job by ID. Scans queues, processing, completed, failed.
+     */
+    async findQueueById(id) {
+        const serialized = await this.redis.get(this.dataKey(id));
+        if (serialized) {
+            const job = this.deserializeJob(serialized);
+            if (job) {
+                const meta = await this.redis.hgetall(this.metaKey(id));
+                return this.toJobRecord(job, job.queue, meta);
+            }
+        }
+        const keys = await this.redis.keys(`${this.prefix}:*`);
+        for (const key of keys) {
+            if (key.endsWith(":delayed") ||
+                key.includes(":meta:") ||
+                key.includes(":data:") ||
+                key === this.failedKey() ||
+                key === this.completedKey())
+                continue;
+            const type = await this.redis.type(key);
+            if (type !== "list")
+                continue;
+            const items = await this.redis.lrange(key, 0, -1);
+            for (const s of items) {
+                const job = this.deserializeJob(s);
+                if (job && job.id === id)
+                    return this.toJobRecord(job, key.replace(`${this.prefix}:`, ""));
+            }
+        }
+        const failedItems = await this.redis.lrange(this.failedKey(), 0, -1);
+        for (const s of failedItems) {
+            try {
+                const parsed = JSON.parse(s);
+                if (parsed.id === id) {
+                    return {
+                        id: parsed.id,
+                        queue: parsed.queue ?? "default",
+                        payload: parsed.payload,
+                        attempts: parsed.attempts ?? 0,
+                        available_at: parsed.availableAt ?? null,
+                        created_at: parsed.createdAt ?? null,
+                        status: "failed",
+                        started_at: null,
+                        finished_at: null,
+                        failed_at: parsed.failedAt ?? null,
+                        exception: parsed.exception ??
+                            (parsed.error
+                                ? parsed.error + "\n" + (parsed.stack || "")
+                                : null),
+                    };
+                }
+            }
+            catch {
+                // skip
+            }
+        }
+        return null;
+    }
+    /**
+     * Find jobs by property key/value. Scans queue lists. Returns array of matches.
+     */
+    async findQueueBy(key, value) {
+        const results = [];
+        const keys = await this.redis.keys(`${this.prefix}:*`);
+        for (const redisKey of keys) {
+            if (redisKey.endsWith(":delayed") ||
+                redisKey === this.failedKey() ||
+                redisKey === this.completedKey() ||
+                redisKey.includes(":meta:") ||
+                redisKey.includes(":data:"))
+                continue;
+            const type = await this.redis.type(redisKey);
+            if (type !== "list")
+                continue;
+            const items = await this.redis.lrange(redisKey, 0, -1);
+            for (const serialized of items) {
+                const job = this.deserializeJob(serialized);
+                if (!job)
+                    continue;
+                let target = job[key];
+                if (target === undefined && typeof job.payload === "string") {
+                    try {
+                        const p = JSON.parse(job.payload);
+                        target = p?.[key];
+                    }
+                    catch {
+                        // ignore
+                    }
+                }
+                else if (target === undefined && typeof job.payload === "object") {
+                    target = job.payload?.[key];
+                }
+                if (target !== undefined && String(target) === String(value)) {
+                    results.push(this.toJobRecord(job, redisKey.replace(`${this.prefix}:`, "")));
+                }
+            }
+        }
+        const completedItems = await this.redis.lrange(this.completedKey(), 0, -1);
+        for (const s of completedItems) {
+            const job = this.deserializeJob(s);
+            if (!job)
+                continue;
+            let target = job[key];
+            if (target === undefined && typeof job.payload === "string") {
+                try {
+                    const p = JSON.parse(job.payload);
+                    target = p?.[key];
+                }
+                catch {
+                    // ignore
+                }
+            }
+            else if (target === undefined && typeof job.payload === "object") {
+                target = job.payload?.[key];
+            }
+            if (target !== undefined && String(target) === String(value)) {
+                results.push(this.toJobRecord(job, job.queue ?? "default"));
+            }
+        }
+        const failedItems = await this.redis.lrange(this.failedKey(), 0, -1);
+        for (const s of failedItems) {
+            try {
+                const parsed = JSON.parse(s);
+                let target = parsed[key];
+                if (target === undefined && parsed.payload) {
+                    const p = typeof parsed.payload === "string"
+                        ? JSON.parse(parsed.payload)
+                        : parsed.payload;
+                    target = p?.[key];
+                }
+                if (target !== undefined && String(target) === String(value)) {
+                    results.push({
+                        id: parsed.id,
+                        queue: parsed.queue ?? "default",
+                        payload: parsed.payload,
+                        attempts: parsed.attempts ?? 0,
+                        available_at: parsed.availableAt ?? null,
+                        created_at: parsed.createdAt ?? null,
+                        status: "failed",
+                        started_at: null,
+                        finished_at: null,
+                        failed_at: parsed.failedAt ?? null,
+                        exception: parsed.exception ??
+                            (parsed.error
+                                ? parsed.error + "\n" + (parsed.stack || "")
+                                : null),
+                    });
+                }
+            }
+            catch {
+                // skip
+            }
+        }
+        return this.sortByLatest(results);
+    }
+}
+exports.RedisDriver = RedisDriver;

package/lib/Queue/Job.d.ts

@@ -1,6 +1,7 @@
 import { JobData } from "./type";
 export declare abstract class Job<T = any> implements JobData {
     id?: string;
+    /** Path within app/Jobs (e.g. "ProcessEmail" or "Notifications/ProcessEmail"). Defaults to constructor name when empty. */
     path: string;
     displayName?: string;
     maxAttempts: number;
@@ -9,6 +10,13 @@ export declare abstract class Job<T = any> implements JobData {
     delay: number;
     data: T;
     constructor(data: T);
+    /** Resolved path for loading (user path or default constructor name) */
+    get jobPath(): string;
+    /**
+     * Dispatch the job to the queue. Uses delay if set.
+     * @example ProcessEmail.dispatch({ to: 'user@example.com' })
+     */
+    static dispatch<T>(this: new (data: T) => Job<T>, data: T): Promise<string>;
     /**
      * Handle the job execution
      */

package/lib/Queue/Job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Job.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/Job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,8BAAsB,GAAG,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,OAAO;IAC5C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAM;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAK;IACxB,OAAO,EAAE,MAAM,CAAM;IACrB,QAAQ,EAAE,MAAM,CAAK;IACrB,KAAK,EAAE,MAAM,CAAK;IAClB,IAAI,EAAE,CAAC,CAAC;gBAEH,IAAI,EAAE,CAAC;IAMnB;;OAEG;IACH,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC;;OAEG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIvC;;OAEG;IACI,SAAS,IAAI,MAAM;IAY1B;;OAEG;WACW,cAAc,CAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,GACjD,GAAG;CA0BP"}
+{"version":3,"file":"Job.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/Job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,8BAAsB,GAAG,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,OAAO;IAC5C,EAAE,CAAC,EAAE,MAAM,CAAC;IACnB,2HAA2H;IACpH,IAAI,EAAE,MAAM,CAAM;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAK;IACxB,OAAO,EAAE,MAAM,CAAM;IACrB,QAAQ,EAAE,MAAM,CAAK;IACrB,KAAK,EAAE,MAAM,CAAK;IAClB,IAAI,EAAE,CAAC,CAAC;gBAEH,IAAI,EAAE,CAAC;IAKnB,wEAAwE;IACxE,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED;;;OAGG;WACU,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAC7B,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,MAAM,CAAC;IAgBlB;;OAEG;IACH,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC;;OAEG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIvC;;OAEG;IACI,SAAS,IAAI,MAAM;IAc1B;;OAEG;WACW,cAAc,CAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,GACjD,GAAG;CAkBP"}

package/lib/Queue/Job.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Job = void 0;
 class Job {
     constructor(data) {
+        /** Path within app/Jobs (e.g. "ProcessEmail" or "Notifications/ProcessEmail"). Defaults to constructor name when empty. */
         this.path = "";
         this.maxAttempts = 3;
         this.timeout = 60; // seconds
@@ -10,7 +11,27 @@ class Job {
         this.delay = 0;
         this.data = data;
         this.displayName = this.constructor.name;
-        this.path = "app/Jobs/";
+    }
+    /** Resolved path for loading (user path or default constructor name) */
+    get jobPath() {
+        return this.path || this.constructor.name;
+    }
+    /**
+     * Dispatch the job to the queue. Uses delay if set.
+     * @example ProcessEmail.dispatch({ to: 'user@example.com' })
+     */
+    static async dispatch(data) {
+        const app = globalThis
+            .app;
+        const queue = app?.resolve("Queue");
+        if (!queue) {
+            throw new Error("Queue not registered. Ensure withConfig includes queue config.");
+        }
+        const job = new this(data);
+        if (job.delay > 0) {
+            return queue.later(job, job.delay);
+        }
+        return queue.push(job);
     }
     /**
      * Calculate backoff time based on attempts
@@ -24,11 +45,13 @@ class Job {
     serialize() {
         return JSON.stringify({
             job: this.constructor.name,
+            path: this.jobPath,
             id: this.id,
             displayName: this.displayName,
             maxAttempts: this.maxAttempts,
             timeout: this.timeout,
             attempts: this.attempts,
+            delay: this.delay,
             data: this.data,
         });
     }
@@ -43,6 +66,7 @@ class Job {
         }
         const job = new JobClass(parsed.data);
         job.id = parsed.id;
+        job.path = parsed.path ?? "";
         job.displayName = parsed.displayName;
         job.maxAttempts = parsed.maxAttempts;
         job.timeout = parsed.timeout;

package/lib/Queue/JobsLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JobsLogger.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/JobsLogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAI5B,qBAAa,SAAS;IAMR,OAAO,CAAC,GAAG;IAJvB,OAAO,CAAC,GAAG,CAC2F;IACtG,OAAO,CAAC,KAAK,CAAS;gBAEF,GAAG,EAAE,GAAG;IAI5B,UAAU;IASV,OAAO;IAWP,MAAM,CAAC,KAAK,EAAE,GAAG;IAWjB,OAAO,CAAC,QAAQ;CAQjB"}
+{"version":3,"file":"JobsLogger.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/JobsLogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAI5B,qBAAa,SAAS;IAMR,OAAO,CAAC,GAAG;IAJvB,OAAO,CAAC,GAAG,CAC2F;IACtG,OAAO,CAAC,KAAK,CAAS;gBAEF,GAAG,EAAE,GAAG;IAI5B,UAAU;IAQV,OAAO;IAYP,MAAM,CAAC,KAAK,EAAE,GAAG;IAYjB,OAAO,CAAC,QAAQ;CAQjB"}

package/lib/Queue/JobsLogger.js

@@ -16,15 +16,18 @@ class JobLogger {
     }
     processing() {
         const date = Date_1.Carbon.now().format("yyyy-MM-dd H:i:s");
-        console.log(`${date} ${this.job.path}${this.job.displayName} ${colors_1.default.gray(this.dot)}  ${colors_1.default.yellow("RUNNING")}`);
+        const label = `app/Jobs/${this.job.jobPath}`;
+        console.log(`${date} ${label} ${colors_1.default.gray(this.dot)}  ${colors_1.default.yellow("RUNNING")}`);
     }
     success() {
         const date = Date_1.Carbon.now().format("yyyy-MM-dd H:i:s");
-        console.log(`${date} ${this.job.path}${this.job.displayName} ${colors_1.default.gray(this.dot)}  ${this.duration(performance.now() - this.start)} ${colors_1.default.green("DONE")}`);
+        const label = `app/Jobs/${this.job.jobPath}`;
+        console.log(`${date} ${label} ${colors_1.default.gray(this.dot)}  ${this.duration(performance.now() - this.start)} ${colors_1.default.green("DONE")}\n`);
     }
     failed(error) {
         const date = Date_1.Carbon.now().format("yyyy-MM-dd H:i:s");
-        console.log(`${date} ${this.job.path}${this.job.displayName} ${colors_1.default.gray(this.dot)}  ${this.duration(performance.now() - this.start)} ${colors_1.default.red("FAILED")}`);
+        const label = `app/Jobs/${this.job.jobPath}`;
+        console.log(`${date} ${label} ${colors_1.default.gray(this.dot)}  ${this.duration(performance.now() - this.start)} ${colors_1.default.red("FAILED")} \n`);
     }
     duration(time) {
         return (time.toLocaleString("en-US", {

package/lib/Queue/Queue.d.ts

@@ -6,6 +6,7 @@ export declare class Queue {
     private defaultQueue;
     events: EventEmitter;
     private jobClasses;
+    private processSync;
     constructor(config: QueueConfig);
     private resolveDriver;
     /**
@@ -36,5 +37,21 @@ export declare class Queue {
      * Run a single worker
      */
     private runWorker;
+    getQueues(): Promise<any[]>;
+    findQueueById(id: string): Promise<Record<string, any>>;
+    findQueueBy(key: string, value: any): Promise<any[]>;
+    /** Delete a job by ID (for dashboard manual delete). */
+    deleteJob(jobId: string): Promise<void>;
+    /**
+     * Retry a failed job — removes it from failed state, re-queues, and runs it immediately.
+     * Returns the new job ID on success, or null if the job was not found.
+     */
+    retry(jobId: string): Promise<string | null>;
+    /**
+     * Run a specific job by ID immediately.
+     * Works for pending, failed, and processing jobs.
+     * Deletes the old record, executes handle(), then writes the final status.
+     */
+    runJob(jobId: string): Promise<boolean>;
 }
 //# sourceMappingURL=Queue.d.ts.map

package/lib/Queue/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/Queue.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAI5B,qBAAa,KAAK;IAChB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAqB;IAClC,MAAM,EAAE,YAAY,CAAsB;IACjD,OAAO,CAAC,UAAU,CAA8C;gBAEpD,MAAM,EAAE,WAAW;IAI/B,OAAO,CAAC,aAAa;IAUrB;;OAEG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI;IAIxE;;OAEG;IACU,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE;;OAEG;IACU,KAAK,CAAC,CAAC,EAClB,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EACX,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IAwBlB;;OAEG;IACU,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0D1D;;OAEG;YACW,eAAe;IAqB7B;;OAEG;IACU,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;OAEG;YACW,SAAS;CAUxB"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/Queue.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAI5B,qBAAa,KAAK;IAChB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAqB;IAClC,MAAM,EAAE,YAAY,CAAsB;IACjD,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,WAAW,CAAU;gBAEjB,MAAM,EAAE,WAAW;IAQ/B,OAAO,CAAC,aAAa;IAqBrB;;OAEG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI;IAIxE;;OAEG;IACU,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4BlE;;OAEG;IACU,KAAK,CAAC,CAAC,EAClB,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EACX,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IA4BlB;;OAEG;IACU,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4D1D;;OAEG;YACW,eAAe;IAuB7B;;OAEG;IACU,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;OAEG;YACW,SAAS;IAWV,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAI3B,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAIvD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIjE,wDAAwD;IAC3C,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD;;;OAGG;IACU,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4BzD;;;;OAIG;IACU,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAyErD"}