jcc-express-mvc 1.8.7 → 1.8.21

package/lib/Queue/Drivers/MemoryDriver.js

@@ -1,17 +1,137 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryDriver = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const app_root_path_1 = __importDefault(require("app-root-path"));
 const uuid_1 = require("uuid");
+function toStored(item) {
+    return {
+        id: item.id,
+        job: item.job,
+        availableAt: item.availableAt,
+        status: item.status,
+        startedAt: item.startedAt,
+        finishedAt: item.finishedAt,
+        failedAt: item.failedAt,
+        exception: item.exception,
+    };
+}
+function fromStored(stored) {
+    return {
+        id: stored.id,
+        job: stored.job,
+        availableAt: stored.availableAt,
+        status: stored.status,
+        startedAt: stored.startedAt,
+        finishedAt: stored.finishedAt,
+        failedAt: stored.failedAt,
+        ...(stored.exception && { exception: stored.exception }),
+    };
+}
 class MemoryDriver {
-    constructor(defaultQueue) {
-        this.defaultQueue = defaultQueue;
+    constructor(config = "default") {
         this.queues = {};
         this.fail = [];
-        this.jobClasses = {};
+        this.completed = [];
+        this.processing = new Map();
+        this.filePath = null;
+        const defaultQueue = typeof config === "string" ? config : (config.defaultQueue ?? "default");
         this.queues[defaultQueue] = [];
+        if (typeof config === "object" && config.file) {
+            this.filePath = path.resolve(app_root_path_1.default.path, config.file);
+            this.load();
+        }
     }
-    registerJobClass(name, jobClass) {
-        this.jobClasses[name] = jobClass;
+    load() {
+        const filePath = this.filePath ?? path.resolve(app_root_path_1.default.path, "storage/queue.json");
+        if (!filePath || !fs.existsSync(filePath))
+            return;
+        try {
+            const data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+            this.queues = {};
+            for (const [q, items] of Object.entries(data.queues || {})) {
+                this.queues[q] = items.map(fromStored);
+            }
+            this.completed = (data.completed || []).map(fromStored);
+            this.fail = (data.fail || []).map((f) => ({
+                id: f.id,
+                job: f.job,
+                error: f.error ?? {
+                    message: f.exception ?? "",
+                    stack: f.error?.stack ?? "",
+                },
+                failedAt: f.failedAt ?? Date.now(),
+                exception: f.exception,
+            }));
+        }
+        catch {
+            // Ignore corrupt or missing file
+        }
+    }
+    save() {
+        if (!this.filePath)
+            return;
+        try {
+            const dir = path.dirname(this.filePath);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            const data = {
+                queues: {},
+                completed: this.completed.map(toStored),
+                fail: this.fail.map((f) => ({
+                    id: f.id,
+                    job: f.job,
+                    error: f.error,
+                    failedAt: f.failedAt,
+                    exception: f.exception ?? f.error?.message + "\n" + (f.error?.stack || ""),
+                })),
+            };
+            for (const [q, items] of Object.entries(this.queues)) {
+                data.queues[q] = items.map(toStored);
+            }
+            fs.writeFileSync(this.filePath, JSON.stringify(data, null, 0));
+        }
+        catch {
+            // Ignore write errors
+        }
     }
     async push(job, queue) {
         if (!this.queues[queue]) {
@@ -21,9 +141,14 @@ class MemoryDriver {
         job.id = id;
         this.queues[queue].push({
             id,
-            job,
+            job: { ...job, status: "pending" },
             availableAt: Date.now(),
+            status: "pending",
+            startedAt: undefined,
+            finishedAt: undefined,
+            failedAt: undefined,
         });
+        this.save();
     }
     async later(job, delay, queue) {
         if (!this.queues[queue]) {
@@ -31,40 +156,224 @@ class MemoryDriver {
         }
         const id = job.id || (0, uuid_1.v4)();
         job.id = id;
+        this.queues[queue].push({
+            id,
+            job: { ...job, status: "pending" },
+            availableAt: Date.now() + delay * 1000,
+            status: "pending",
+            startedAt: undefined,
+            finishedAt: undefined,
+            failedAt: undefined,
+        });
+        this.save();
     }
     async pop(queue) {
+        this.load();
         if (!this.queues[queue]) {
             return null;
         }
         const now = Date.now();
-        // Find the first job that's available
-        const index = this.queues[queue].findIndex((item) => item.availableAt <= now);
-        if (index === -1) {
+        const index = this.queues[queue].findIndex((item) => item.availableAt <= now && (!item.status || item.status === "pending" || item.status === "processing"));
+        if (index === -1)
             return null;
-        }
-        // Remove from queue but keep a reference
         const [item] = this.queues[queue].splice(index, 1);
-        return item;
+        item.status = "processing";
+        item.startedAt = Date.now();
+        this.processing.set(item.id, item);
+        const queuedJob = item.job;
+        if (typeof queuedJob.payload !== "string") {
+            queuedJob.payload = JSON.stringify(queuedJob.payload);
+        }
+        queuedJob.status = "processing";
+        queuedJob.startedAt = new Date(item.startedAt);
+        this.save();
+        return queuedJob;
     }
     async delete(jobId) {
+        this.processing.delete(jobId);
         for (const queueName in this.queues) {
-            this.queues[queueName] = this.queues[queueName].filter((job) => job.id !== jobId);
+            this.queues[queueName] = this.queues[queueName].filter((item) => item.id !== jobId);
+        }
+        this.fail = this.fail.filter((f) => f.id !== jobId);
+        this.completed = this.completed.filter((c) => c.id !== jobId);
+        this.save();
+    }
+    async updateStatus(jobId, update) {
+        const item = this.processing.get(jobId);
+        if (item) {
+            item.status = update.status;
+            if (update.startedAt)
+                item.startedAt = update.startedAt.getTime();
+            if (update.finishedAt)
+                item.finishedAt = update.finishedAt.getTime();
+            if (update.failedAt)
+                item.failedAt = update.failedAt.getTime();
+            if (update.status === "completed") {
+                this.processing.delete(jobId);
+                this.completed.push(item);
+            }
+            else if (update.status === "failed") {
+                this.processing.delete(jobId);
+            }
         }
+        const inQueue = Object.values(this.queues)
+            .flat()
+            .find((i) => i.id === jobId);
+        if (inQueue) {
+            inQueue.status = update.status;
+            if (update.startedAt)
+                inQueue.startedAt = update.startedAt.getTime();
+            if (update.finishedAt)
+                inQueue.finishedAt = update.finishedAt.getTime();
+            if (update.failedAt)
+                inQueue.failedAt = update.failedAt.getTime();
+            if (update.status === "completed") {
+                for (const queueName in this.queues) {
+                    this.queues[queueName] = this.queues[queueName].filter((i) => i.id !== jobId);
+                }
+                this.completed.push(inQueue);
+            }
+        }
+        this.save();
     }
     async release(job, delay = 0) {
+        if (!this.queues[job.queue]) {
+            this.queues[job.queue] = [];
+        }
         this.queues[job.queue].push({
             id: job.id,
             job,
             availableAt: Date.now() + delay,
+            status: "pending",
+            startedAt: undefined,
+            finishedAt: undefined,
+            failedAt: undefined,
         });
+        this.save();
     }
     async failed(job, error) {
+        const exception = error?.message + "\n" + (error?.stack || "");
+        this.processing.delete(job.id);
         this.fail.push({
             id: job.id,
-            job,
+            job: { ...job, status: "failed", failedAt: new Date() },
             error,
             failedAt: Date.now(),
+            exception,
         });
+        this.save();
+    }
+    async getQueues() {
+        this.load();
+        const all = [];
+        for (const items of Object.values(this.queues)) {
+            for (const item of items) {
+                all.push(this.toJobRecord(item, "default"));
+            }
+        }
+        for (const item of this.processing.values()) {
+            all.push(this.toJobRecord(item, "default", "processing"));
+        }
+        for (const item of this.completed) {
+            all.push(this.toJobRecord(item, "default", "completed"));
+        }
+        for (const f of this.fail) {
+            all.push({
+                id: f.id,
+                queue: "default",
+                payload: f.job.payload,
+                attempts: f.job.attempts,
+                available_at: null,
+                created_at: f.job.createdAt,
+                status: "failed",
+                started_at: null,
+                finished_at: null,
+                failed_at: f.failedAt ?? null,
+                exception: f.exception ?? f.error?.message + "\n" + (f.error?.stack || ""),
+            });
+        }
+        return this.sortByLatest(all);
+    }
+    sortByLatest(jobs) {
+        return jobs.sort((a, b) => {
+            const tsA = a.finished_at ?? a.failed_at ?? a.available_at ?? a.created_at ?? 0;
+            const tsB = b.finished_at ?? b.failed_at ?? b.available_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;
+        });
+    }
+    async findQueueById(id) {
+        this.load();
+        for (const items of Object.values(this.queues)) {
+            const item = items.find((i) => i.id === id);
+            if (item)
+                return this.toJobRecord(item, "default");
+        }
+        const proc = this.processing.get(id);
+        if (proc)
+            return this.toJobRecord(proc, "default");
+        const comp = this.completed.find((c) => c.id === id);
+        if (comp)
+            return this.toJobRecord(comp, "default");
+        const f = this.fail.find((x) => x.id === id);
+        if (f) {
+            return {
+                id: f.id,
+                queue: "default",
+                payload: f.job.payload,
+                attempts: f.job.attempts,
+                status: "failed",
+                started_at: null,
+                finished_at: null,
+                failed_at: f.failedAt,
+                exception: f.exception ?? f.error?.message + "\n" + (f.error?.stack || ""),
+            };
+        }
+        return null;
+    }
+    toJobRecord(item, queue, statusOverride) {
+        return {
+            id: item.id,
+            queue,
+            payload: item.job.payload,
+            attempts: item.job.attempts,
+            available_at: item.availableAt,
+            created_at: item.job.createdAt,
+            status: statusOverride ?? item.status ?? "pending",
+            started_at: item.startedAt ?? null,
+            finished_at: item.finishedAt ?? null,
+            failed_at: item.failedAt ?? null,
+            exception: item.exception ?? null,
+        };
+    }
+    async findQueueBy(key, value) {
+        this.load();
+        const results = [];
+        const fromFail = this.fail.filter((f) => f[key] === value || f.job?.[key] === value);
+        for (const f of fromFail) {
+            results.push({
+                id: f.id,
+                queue: "default",
+                payload: f.job.payload,
+                attempts: f.job.attempts,
+                status: "failed",
+                started_at: null,
+                finished_at: null,
+                failed_at: f.failedAt,
+                exception: f.exception ?? f.error?.message + "\n" + (f.error?.stack || ""),
+            });
+        }
+        const allItems = [
+            ...Object.values(this.queues).flat(),
+            ...this.processing.values(),
+            ...this.completed,
+        ];
+        const matching = allItems.filter((i) => i[key] === value || i.job?.[key] === value);
+        for (const item of matching) {
+            results.push(this.toJobRecord(item, "default"));
+        }
+        return this.sortByLatest(results);
     }
 }
 exports.MemoryDriver = MemoryDriver;

package/lib/Queue/Drivers/RedisDriver.d.ts

@@ -0,0 +1,48 @@
+import { JobStatusUpdate, QueueDriver, QueuedJob } from "../interface";
+export interface RedisQueueConfig {
+    driver: "redis";
+    connection?: string | Record<string, any>;
+    queue?: string;
+    prefix?: string;
+    /** Seconds to block when waiting for jobs (BLPOP). Default 5. */
+    blockFor?: number;
+}
+export declare class RedisDriver implements QueueDriver {
+    private redis;
+    private prefix;
+    private defaultQueue;
+    private blockFor;
+    constructor(config: RedisQueueConfig);
+    private listKey;
+    private delayedKey;
+    private failedKey;
+    private completedKey;
+    private metaKey;
+    private dataKey;
+    private serializeJob;
+    private deserializeJob;
+    push(job: QueuedJob, queue: string): Promise<void>;
+    later(job: QueuedJob, delay: number, queue: string): Promise<void>;
+    private migrateDelayedJobs;
+    pop(queue: string): Promise<QueuedJob | null>;
+    delete(jobId: string): Promise<void>;
+    updateStatus(jobId: string, update: JobStatusUpdate): Promise<void>;
+    release(job: QueuedJob, delay?: number): Promise<void>;
+    failed(job: QueuedJob, error: any): Promise<void>;
+    /**
+     * Get all jobs from all queues (pending, processing, completed, failed).
+     * Returns array with status, started_at, finished_at, failed_at.
+     */
+    getQueues(): Promise<any[]>;
+    private sortByLatest;
+    private toJobRecord;
+    /**
+     * Find a job by ID. Scans queues, processing, completed, failed.
+     */
+    findQueueById(id: string): Promise<any>;
+    /**
+     * Find jobs by property key/value. Scans queue lists. Returns array of matches.
+     */
+    findQueueBy(key: string, value: any): Promise<any[]>;
+}
+//# sourceMappingURL=RedisDriver.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAUD,qBAAa,WAAY,YAAW,WAAW;IAC7C,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAEb,MAAM,EAAE,gBAAgB;IAQpC,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,cAAc;IA4BT,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlD,KAAK,CAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;YAUF,kBAAkB;IAiBnB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAiC7C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CpC,YAAY,CACvB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IA+DH,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzD,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC9D;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAgExC,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,WAAW;IA0BnB;;OAEG;IACU,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IA0DpD;;OAEG;IACU,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA6FlE"}