jcc-express-mvc 1.8.7 → 1.8.21

package/lib/Jcc-eloquent/lib/utils/index.js

@@ -41,6 +41,7 @@ const inflection = __importStar(require("inflection"));
 const DatabaseError_1 = require("../Error/DatabaseError");
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const Model_1 = require("../Model");
+const Config_1 = require("../../../Config/Config");
 class Utils {
     /**
      * Pluralizes a string.
@@ -153,6 +154,54 @@ class Utils {
         }
         return links;
     }
+    /**
+     * Merge `request.query` with overrides into a full URL (pathname + search).
+     * Pass `null` / `undefined` in overrides to remove a query key.
+     */
+    static mergeRequestQuery(request, overrides) {
+        const host = request.get("host") || "localhost";
+        const proto = (request.protocol || "http").replace(/:$/, "");
+        const pathname = request.path || "/";
+        const base = `${proto}://${host}${pathname}`;
+        const u = new URL(base);
+        const sp = u.searchParams;
+        for (const [k, v] of Object.entries(request.query)) {
+            if (v === undefined || v === null)
+                continue;
+            const val = Array.isArray(v) ? v[0] : v;
+            sp.set(k, String(val));
+        }
+        for (const [k, v] of Object.entries(overrides)) {
+            if (v === null || v === undefined)
+                sp.delete(k);
+            else
+                sp.set(k, String(v));
+        }
+        return u.toString();
+    }
+    /** Encode a cursor column value for `?cursor=` (base64url JSON). */
+    static encodeCursorValue(value) {
+        const v = value instanceof Date ? value.toISOString() : value;
+        const payload = JSON.stringify({ v });
+        return Buffer.from(payload, "utf8").toString("base64url");
+    }
+    /** Decode `?cursor=` from {@link encodeCursorValue} or fall back to raw string / number. */
+    static decodeCursorValue(encoded) {
+        if (encoded == null || encoded === "")
+            return undefined;
+        try {
+            const json = JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+            if (json && typeof json === "object" && "v" in json)
+                return json.v;
+        }
+        catch {
+            /* fall through */
+        }
+        const n = Number(encoded);
+        if (!Number.isNaN(n) && String(n) === String(encoded).trim())
+            return n;
+        return encoded;
+    }
     /**
      * Extracts and returns metadata and configurations for a given Model.
      * @param {any} Model - The model whose metadata needs to be extracted. This should follow the ORM's Model structure.
@@ -265,5 +314,18 @@ class Utils {
         return (typeof value === "function" &&
             /^\s*class\s+/.test(Function.prototype.toString.call(value)));
     }
+    static isPostgres() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "postgres" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "pg");
+    }
+    static isMysql() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "mysql" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "mysql2");
+    }
+    static isSqlite() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "sqlite" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "better-sqlite3" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "bun:sqlite");
+    }
 }
 exports.Utils = Utils;

package/lib/Middleware/index.d.ts

@@ -8,6 +8,7 @@ export declare class Middleware {
     constructor(app: Application);
     loadStaticFiles(): void;
     use(globalMiddleares: RequestHandler[]): void;
+    private requestResponseMiddleware;
     /**
      * Default templating engine for the application.
      * It sets up the Blade templating engine with the express app.

package/lib/Middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAUjB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAW5B,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IA+BtC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAejB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAW5B,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IA8BtC,OAAO,CAAC,yBAAyB;IASjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}

package/lib/Middleware/index.js

@@ -11,6 +11,11 @@ const request_1 = require("../Request/request");
 const morgan_1 = __importDefault(require("morgan"));
 const Config_1 = require("../Config/Config");
 const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
+const cookie_parser_1 = __importDefault(require("cookie-parser"));
+const connect_flash_1 = __importDefault(require("connect-flash"));
+const express_fileupload_1 = __importDefault(require("express-fileupload"));
+const ExpressJccSession_1 = require("../Session/ExpressJccSession");
+const SessionManager_1 = require("../Session/SessionManager");
 class Middleware {
     //
     constructor(app) {
@@ -35,29 +40,36 @@ class Middleware {
         [
             this.express.json(),
             this.express.urlencoded({ extended: false }),
+            (0, cookie_parser_1.default)(),
+            this.app.resolve(SessionManager_1.SessionManager.name).getExpressMiddleware(),
+            (0, connect_flash_1.default)(),
+            (0, express_fileupload_1.default)(),
             (0, cors_1.default)(this.corsOption()),
             (0, morgan_1.default)(Config_1.config.get("APP_DEBUG") === "true" ? "dev" : "combined"),
             (0, express_rate_limit_1.default)(this.app.config.rateLimit || {}),
+            this.requestResponseMiddleware(),
             ...globalMiddleares,
         ].forEach((middleware) => this.expressApp.use(middleware));
         //
         this.expressApp.use(((req, res, next) => {
-            new Response_1.HttpResponse(req, res);
-            new request_1.HttpRequest(req, res);
             this.app.instance("request", req);
             this.app.instance("response", res);
             this.app.instance("next", next);
             res.on("finish", () => {
-                this.app.forgetMany([
-                    "request",
-                    "response",
-                    "next",
-                ]);
+                this.app.forgetMany(["request", "response", "next"]);
             });
-            // 
+            //
             next();
         }));
     }
+    requestResponseMiddleware() {
+        return (req, res, next) => {
+            req.jccSession = (0, ExpressJccSession_1.createExpressJccSession)(req);
+            new Response_1.HttpResponse(req, res);
+            new request_1.HttpRequest(req, res);
+            next();
+        };
+    }
     /**
      * Default templating engine for the application.
      * It sets up the Blade templating engine with the express app.

package/lib/Model/Sequelize.d.ts

@@ -0,0 +1,3 @@
+export declare class SequelizeModel {
+}
+//# sourceMappingURL=Sequelize.d.ts.map

package/lib/Model/Sequelize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Sequelize.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Model/Sequelize.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;CAAG"}

package/lib/Model/Sequelize.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SequelizeModel = void 0;
+class SequelizeModel {
+}
+exports.SequelizeModel = SequelizeModel;

package/lib/Providers/RouteServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Providers/RouteServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,oBAAqB,SAAQ,eAAe;gBAC3C,GAAG,EAAE,WAAW;IAItB,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;CACb"}
+{"version":3,"file":"RouteServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Providers/RouteServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,oBAAqB,SAAQ,eAAe;gBAC3C,GAAG,EAAE,WAAW;IAItB,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;CACb"}

package/lib/Providers/RouteServiceProvider.js

@@ -14,6 +14,9 @@ class RouteServiceProvider extends ServiceProvider_1.ServiceProvider {
                 (0, util_1.loadRoute)(route.name);
             });
         }
+        Route_1.Route.basePath("/queue").group((Route) => {
+            require("../Queue/Route/web");
+        });
     }
     register() { }
     boot() { }

package/lib/Providers/SessionServiceProvider.d.ts

@@ -0,0 +1,12 @@
+import type { Application } from "../Application/Application";
+import { ServiceProvider } from "./ServiceProvider";
+/**
+ * Registers {@link SessionManager} from `app.config.session` (Laravel-style: driver, lifetime, stores).
+ * Used by {@link Middleware} to mount `express-session` with the correct store.
+ */
+export declare class SessionServiceProvider extends ServiceProvider {
+    constructor(app: Application);
+    register(): void;
+    private mergeSessionConfig;
+}
+//# sourceMappingURL=SessionServiceProvider.d.ts.map

package/lib/Providers/SessionServiceProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Providers/SessionServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;gBAC7C,GAAG,EAAE,WAAW;IAI5B,QAAQ,IAAI,IAAI;IAMhB,OAAO,CAAC,kBAAkB;CA+B3B"}

package/lib/Providers/SessionServiceProvider.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionServiceProvider = void 0;
+const ServiceProvider_1 = require("./ServiceProvider");
+const SessionManager_1 = require("../Session/SessionManager");
+/**
+ * Registers {@link SessionManager} from `app.config.session` (Laravel-style: driver, lifetime, stores).
+ * Used by {@link Middleware} to mount `express-session` with the correct store.
+ */
+class SessionServiceProvider extends ServiceProvider_1.ServiceProvider {
+    constructor(app) {
+        super(app);
+    }
+    register() {
+        this.app.singleton(SessionManager_1.SessionManager.name, () => {
+            return new SessionManager_1.SessionManager(this.mergeSessionConfig());
+        });
+    }
+    mergeSessionConfig() {
+        const raw = (this.app.config?.session ?? {});
+        const defaultLifetime = 120 * 60 * 1000;
+        const lifetimeMs = typeof raw.lifetime === "number" && raw.lifetime > 0
+            ? raw.lifetime
+            : defaultLifetime;
+        const cookieBase = raw.cookie ?? {
+            name: "connect.sid",
+            httpOnly: true,
+            secure: false,
+            sameSite: "lax",
+            maxAge: lifetimeMs,
+        };
+        const cookie = {
+            ...cookieBase,
+            maxAge: cookieBase.maxAge ?? lifetimeMs,
+            path: cookieBase.path ?? "/",
+        };
+        return {
+            driver: raw.driver ?? "file",
+            lifetime: lifetimeMs,
+            cookie,
+            files: raw.files,
+            database: raw.database,
+            redis: raw.redis,
+        };
+    }
+}
+exports.SessionServiceProvider = SessionServiceProvider;

package/lib/Queue/Controllers/QueueControllers.d.ts

@@ -0,0 +1,31 @@
+import { Queue } from "..";
+import { HttpContext } from "../../Interface";
+export declare class QueueControllers {
+    private readonly queue;
+    constructor(queue: Queue);
+    /**
+     * Show the dashboard
+     */
+    dashboard(): Promise<void>;
+    /**
+     * JSON list of queues (API)
+     */
+    index(): Promise<import("../../Interface").AppResponse>;
+    /**
+     * Show the queue
+     */
+    show(status: string): Promise<void>;
+    /**
+     * Retry a failed job or run a pending job.
+     * PUT /queue/jobs/:id/failed  -> retry (re-queue as pending)
+     * PUT /queue/jobs/:id/pending -> run immediately
+     */
+    update(id: string, status: string): Promise<any>;
+    /**
+     * Delete a job (manual delete from dashboard)
+     */
+    destroy(id: string): Promise<any>;
+    private formatJob;
+    runJob({ req }: HttpContext): Promise<any>;
+}
+//# sourceMappingURL=QueueControllers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueueControllers.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Controllers/QueueControllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,qBACa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK;IAEzC;;OAEG;IACG,SAAS;IAIf;;OAEG;IACG,KAAK;IAKX;;OAEG;IAEG,IAAI,CAAC,MAAM,EAAE,MAAM;IAWzB;;;;OAIG;IAEG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA+BvC;;OAEG;IAEG,OAAO,CAAC,EAAE,EAAE,MAAM;IAKxB,OAAO,CAAC,SAAS;IAkBX,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW;CAGlC"}

package/lib/Queue/Controllers/QueueControllers.js

@@ -0,0 +1,126 @@
+"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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueueControllers = void 0;
+const __1 = require("..");
+const Dependency_1 = require("../../Dependency");
+let QueueControllers = class QueueControllers {
+    constructor(queue) {
+        this.queue = queue;
+    }
+    /**
+     * Show the dashboard
+     */
+    async dashboard() {
+        return view("queue/dashboard");
+    }
+    /**
+     * JSON list of queues (API)
+     */
+    async index() {
+        const queues = await this.queue.getQueues();
+        return response().json({ success: true, data: queues });
+    }
+    /**
+     * Show the queue
+     */
+    async show(status) {
+        const jobs = (await this.queue.findQueueBy("status", status)).map((job) => this.formatJob(job));
+        return view("queue/jobs", {
+            jobs,
+            status: status,
+            totalJobs: jobs?.length || 0,
+        });
+    }
+    /**
+     * Retry a failed job or run a pending job.
+     * PUT /queue/jobs/:id/failed  -> retry (re-queue as pending)
+     * PUT /queue/jobs/:id/pending -> run immediately
+     */
+    async update(id, status) {
+        const job = await this.queue.findQueueById(id);
+        if (!job) {
+            return response()
+                .status(404)
+                .json({ success: false, message: "Job not found" });
+        }
+        const currentStatus = job.status?.toLowerCase();
+        if (currentStatus === "failed") {
+            const newId = await this.queue.retry(id);
+            if (!newId) {
+                return response()
+                    .status(400)
+                    .json({ success: false, message: "Failed to retry job" });
+            }
+        }
+        else if (currentStatus === "pending" || currentStatus === "processing") {
+            await this.queue.runJob(id);
+        }
+        else {
+            return response()
+                .status(400)
+                .json({
+                success: false,
+                message: `Cannot run a ${currentStatus} job`,
+            });
+        }
+        return response().redirectBack();
+    }
+    /**
+     * Delete a job (manual delete from dashboard)
+     */
+    async destroy(id) {
+        await this.queue.deleteJob(id);
+        return response().redirectBack();
+    }
+    formatJob(job) {
+        return {
+            id: job.id,
+            attempts: job.attempts,
+            available_at: job.available_at,
+            queue: job.queue,
+            payload: typeof job.payload === "string" ? JSON.parse(job.payload) : job.payload,
+            created_at: job.created_at,
+            updated_at: job.updated_at,
+            status: job.status,
+            started_at: job.started_at,
+            finished_at: job.finished_at,
+            failed_at: job.failed_at,
+            exception: job.exception,
+        };
+    }
+    async runJob({ req }) {
+        return req.body;
+    }
+};
+exports.QueueControllers = QueueControllers;
+__decorate([
+    (0, Dependency_1.Method)({ params: ["status"] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], QueueControllers.prototype, "show", null);
+__decorate([
+    (0, Dependency_1.Method)({ params: ["id", "status"] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", Promise)
+], QueueControllers.prototype, "update", null);
+__decorate([
+    (0, Dependency_1.Method)({ params: ["id"] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], QueueControllers.prototype, "destroy", null);
+exports.QueueControllers = QueueControllers = __decorate([
+    (0, Dependency_1.Inject)(),
+    __metadata("design:paramtypes", [__1.Queue])
+], QueueControllers);

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

@@ -1,4 +1,4 @@
-import { QueueDriver, QueuedJob } from "../interface";
+import { JobStatusUpdate, QueueDriver, QueuedJob } from "../interface";
 export declare class DatabaseDriver implements QueueDriver {
     push(job: QueuedJob, queue: string): Promise<void>;
     later(job: QueuedJob, delay: number, queue: string): Promise<void>;
@@ -6,5 +6,10 @@ export declare class DatabaseDriver implements QueueDriver {
     delete(jobId: string): Promise<void>;
     release(job: QueuedJob, delay?: number): Promise<void>;
     failed(job: QueuedJob, error: any): Promise<void>;
+    updateStatus(jobId: string, update: JobStatusUpdate): Promise<void>;
+    getQueues(): Promise<any>;
+    findQueueById(id: string): Promise<any>;
+    findQueueBy(key: string, value: any): Promise<any>;
+    private sortByLatest;
 }
 //# sourceMappingURL=DatabaseDriver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DatabaseDriver.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Drivers/DatabaseDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGtD,qBAAa,cAAe,YAAW,WAAW;IACnC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,KAAK,CAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAgBH,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;IAqB5C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAY/D"}
+{"version":3,"file":"DatabaseDriver.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Drivers/DatabaseDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGvE,qBAAa,cAAe,YAAW,WAAW;IACnC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,KAAK,CAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAeH,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;IA+B5C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAezD,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAWjD,YAAY,CACvB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAgBH,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;IAKzB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIvC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAK/D,OAAO,CAAC,YAAY;CASrB"}

package/lib/Queue/Drivers/DatabaseDriver.js

@@ -7,6 +7,7 @@ class DatabaseDriver {
         try {
             await Jcc_eloquent_1.DB.table("jobs").insert({
                 queue,
+                status: "pending",
                 payload: JSON.stringify(job.payload),
                 attempts: 0,
                 available_at: new Date(),
@@ -14,14 +15,13 @@ class DatabaseDriver {
             });
         }
         catch (error) {
-            console.log(error?.message);
+            console.error("[DatabaseDriver] push failed:", error?.message);
+            throw error;
         }
     }
     async later(job, delay, queue) {
-        //
         try {
             await Jcc_eloquent_1.DB.table("jobs").insert({
-                id: job.id,
                 queue,
                 payload: JSON.stringify(job.payload),
                 attempts: 0,
@@ -30,50 +30,105 @@ class DatabaseDriver {
             });
         }
         catch (error) {
-            console.log(error?.message);
+            console.error("[DatabaseDriver] later failed:", error?.message);
+            throw error;
         }
     }
     async pop(queue) {
         try {
-            // Use a slight buffer for time comparison
             const now = new Date(Date.now() + 1000);
             const job = await Jcc_eloquent_1.DB.table("jobs")
                 .where("queue", queue)
                 .where("available_at", "<=", now)
+                .whereRaw("(status = ? OR status = ? OR status IS NULL)", [
+                "pending",
+                "processing",
+            ])
                 .orderBy("available_at", "asc")
                 .first();
-            if (!job) {
-                // console.log(`[DatabaseDriver] No available jobs found in queue '${queue}' at ${now.toISOString()}`);
+            if (!job)
                 return null;
+            try {
+                await this.updateStatus(job.id, {
+                    status: "processing",
+                    startedAt: new Date(),
+                });
             }
-            return job;
+            catch {
+                // status columns may not exist yet
+            }
+            return { ...job, status: "processing", started_at: new Date() };
         }
         catch (error) {
             console.error("[DatabaseDriver] Error in pop():", error?.message);
+            return null;
         }
     }
     async delete(jobId) {
         await Jcc_eloquent_1.DB.table("jobs").where("id", jobId).delete();
     }
     async release(job, delay = 0) {
-        await Jcc_eloquent_1.DB.table("jobs")
-            .where("id", job.id)
-            .update({
+        const base = {
             attempts: job.attempts,
             available_at: new Date(Date.now() + delay),
             updated_at: new Date(),
-        });
+        };
+        try {
+            await Jcc_eloquent_1.DB.table("jobs")
+                .where("id", job.id)
+                .update({ ...base, status: "pending", started_at: null });
+        }
+        catch {
+            await Jcc_eloquent_1.DB.table("jobs").where("id", job.id).update(base);
+        }
     }
     async failed(job, error) {
-        await Jcc_eloquent_1.DB.table("failed_jobs").insert({
-            id: job.id || crypto.randomUUID(),
-            connection: "database",
-            queue: job.queue,
-            payload: JSON.stringify(job.payload),
-            exception: error.message + "\n" + (error.stack || ""),
-            failed_at: new Date().getTime(),
-            created_at: new Date(),
-            updated_at: new Date(),
+        const exception = error?.message + "\n" + (error?.stack || "");
+        try {
+            await Jcc_eloquent_1.DB.table("jobs")
+                .where("id", job.id)
+                .update({ exception, updated_at: new Date() });
+        }
+        catch {
+            // exception column may not exist yet
+        }
+    }
+    async updateStatus(jobId, update) {
+        try {
+            const data = {
+                status: update.status,
+                updated_at: new Date(),
+            };
+            if (update.startedAt)
+                data.started_at = update.startedAt;
+            if (update.finishedAt)
+                data.finished_at = update.finishedAt;
+            if (update.failedAt)
+                data.failed_at = update.failedAt;
+            await Jcc_eloquent_1.DB.table("jobs").where("id", jobId).update(data);
+        }
+        catch {
+            // Columns may not exist yet - run migration to add status, started_at, finished_at, failed_at
+        }
+    }
+    async getQueues() {
+        const rows = (await Jcc_eloquent_1.DB.table("jobs").getRaw()) || [];
+        return this.sortByLatest(rows);
+    }
+    async findQueueById(id) {
+        return Jcc_eloquent_1.DB.table("jobs").where("id", id).firstRaw();
+    }
+    async findQueueBy(key, value) {
+        const rows = await Jcc_eloquent_1.DB.table("jobs").where(key, value).getRaw();
+        return this.sortByLatest(rows || []);
+    }
+    sortByLatest(jobs) {
+        return jobs.sort((a, b) => {
+            const tsA = a.finished_at ?? a.failed_at ?? a.created_at ?? a.available_at ?? 0;
+            const tsB = b.finished_at ?? b.failed_at ?? b.created_at ?? b.available_at ?? 0;
+            const numA = tsA instanceof Date ? tsA.getTime() : (typeof tsA === "number" ? tsA : new Date(tsA)?.getTime() ?? 0);
+            const numB = tsB instanceof Date ? tsB.getTime() : (typeof tsB === "number" ? tsB : new Date(tsB)?.getTime() ?? 0);
+            return numB - numA;
         });
     }
 }

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

@@ -1,17 +1,28 @@
-import { Job } from "../Job";
-import { QueueDriver, QueuedJob } from "../interface";
+import { JobStatusUpdate, QueueDriver, QueuedJob } from "../interface";
+export interface MemoryDriverConfig {
+    defaultQueue?: string;
+    file?: string;
+}
 export declare class MemoryDriver implements QueueDriver {
-    private defaultQueue;
     private queues;
     private fail;
-    private jobClasses;
-    constructor(defaultQueue: string);
-    registerJobClass(name: string, jobClass: new (data: any) => Job): void;
+    private completed;
+    private processing;
+    private filePath;
+    constructor(config?: string | MemoryDriverConfig);
+    private load;
+    private save;
     push(job: QueuedJob, queue: string): Promise<void>;
     later(job: QueuedJob, delay: number, queue: string): Promise<void>;
     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>;
+    getQueues(): Promise<any>;
+    private sortByLatest;
+    findQueueById(id: string): Promise<any>;
+    private toJobRecord;
+    findQueueBy(key: string, value: any): Promise<any[]>;
 }
 //# sourceMappingURL=MemoryDriver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Drivers/MemoryDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAc,WAAW,EAAa,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7E,qBAAa,YAAa,YAAW,WAAW;IAOlC,OAAO,CAAC,YAAY;IANhC,OAAO,CAAC,MAAM,CAAmC;IAEjD,OAAO,CAAC,IAAI,CAAoB;IAEhC,OAAO,CAAC,UAAU,CAA8C;gBAE5C,YAAY,EAAE,MAAM;IAIjC,gBAAgB,CACrB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,KAAK,IAAI,EAAE,GAAG,KAAK,GAAG,GAC/B,IAAI;IAIM,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAelD,KAAK,CAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IASH,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAsB7C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpC,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;CAQ/D"}
+{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Drivers/MemoryDriver.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,eAAe,EACf,WAAW,EAEX,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA4BD,qBAAa,YAAa,YAAW,WAAW;IAC9C,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,QAAQ,CAAuB;gBAE3B,MAAM,GAAE,MAAM,GAAG,kBAA8B;IAW3D,OAAO,CAAC,IAAI;IA0BZ,OAAO,CAAC,IAAI;IA4BC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBlD,KAAK,CAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAoBH,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA8B7C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpC,YAAY,CACvB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAmCH,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;IAiCtC,OAAO,CAAC,YAAY;IAUP,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IA4BpD,OAAO,CAAC,WAAW;IAoBN,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAiClE"}