jcc-express-mvc 1.9.2 → 1.9.3

package/lib/Command-Line/WatchCommand.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WatchCommand = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const net_1 = __importDefault(require("net"));
 const child_process_1 = require("child_process");
-const readline_1 = __importDefault(require("readline"));
 const colors_1 = __importDefault(require("colors"));
 const app_root_path_1 = __importDefault(require("app-root-path"));
 class WatchCommand {
@@ -31,6 +31,7 @@ class WatchCommand {
             "config",
             "database",
             "jcc-express-mvc",
+            "public",
             "resources",
             "routes",
             "route",
@@ -40,6 +41,9 @@ class WatchCommand {
         this.watchers = [];
         this.child = null;
         this.restartTimer = null;
+        this.hotPollTimer = null;
+        this.hotFileActive = false;
+        this.hotWasPresent = false;
         this.isRestarting = false;
         this.suppressNextExitLog = false;
         this.pendingChanges = new Set();
@@ -55,8 +59,8 @@ class WatchCommand {
         this.entryFile = entryFile;
         this.installSignalHandlers();
         this.refreshWatchers();
-        this.renderServeHeader(path_1.default.relative(this.rootPath, resolvedEntry));
-        this.startServer(resolvedEntry);
+        this.renderInitialHeader(path_1.default.relative(this.rootPath, resolvedEntry));
+        this.startServer(resolvedEntry, { silent: false });
     }
     refreshWatchers() {
         this.closeWatchers();
@@ -107,6 +111,66 @@ class WatchCommand {
         catch {
             // Ignore root watcher failures
         }
+        this.watchPublicHot();
+    }
+    /** Vite writes public/hot when the dev server starts — watch it reliably. */
+    watchPublicHot() {
+        const publicDir = path_1.default.join(this.rootPath, "public");
+        const hotPath = path_1.default.join(publicDir, "hot");
+        if (!fs_1.default.existsSync(publicDir))
+            return;
+        this.hotWasPresent = fs_1.default.existsSync(hotPath);
+        try {
+            const dirWatcher = fs_1.default.watch(publicDir, (_eventType, filename) => {
+                const name = filename?.toString().toLowerCase();
+                if (!name || name === "hot") {
+                    this.onPublicHotChanged(hotPath);
+                }
+            });
+            this.watchers.push(dirWatcher);
+        }
+        catch {
+            /* unreadable */
+        }
+        this.syncHotFileWatcher(hotPath);
+    }
+    syncHotFileWatcher(hotPath) {
+        if (this.hotPollTimer) {
+            clearInterval(this.hotPollTimer);
+            this.hotPollTimer = null;
+        }
+        if (this.hotFileActive) {
+            try {
+                fs_1.default.unwatchFile(hotPath);
+            }
+            catch {
+                /* already unwatched */
+            }
+            this.hotFileActive = false;
+        }
+        if (fs_1.default.existsSync(hotPath)) {
+            this.hotWasPresent = true;
+            this.hotFileActive = true;
+            fs_1.default.watchFile(hotPath, { interval: 200 }, () => {
+                this.onPublicHotChanged(hotPath);
+            });
+            return;
+        }
+        this.hotWasPresent = false;
+        // Vite may create public/hot after serve starts — poll until it appears.
+        this.hotPollTimer = setInterval(() => {
+            if (!fs_1.default.existsSync(hotPath))
+                return;
+            this.onPublicHotChanged(hotPath);
+            this.syncHotFileWatcher(hotPath);
+        }, 500);
+    }
+    onPublicHotChanged(hotPath) {
+        const exists = fs_1.default.existsSync(hotPath);
+        if (exists === this.hotWasPresent)
+            return;
+        this.hotWasPresent = exists;
+        this.onFileChanged(hotPath);
     }
     collectWatchDirectories() {
         const dirs = [];
@@ -177,25 +241,42 @@ class WatchCommand {
             clearTimeout(this.restartTimer);
         this.restartTimer = setTimeout(() => {
             this.restartTimer = null;
-            this.restartServer();
+            void this.restartServer();
         }, 250);
     }
     shouldIgnore(filePath) {
         const relativePath = path_1.default.relative(this.rootPath, filePath);
         const normalizedPath = relativePath.split(path_1.default.sep).join("/").toLowerCase();
+        if (normalizedPath === "public/hot" || normalizedPath === "public") {
+            return false;
+        }
         if (normalizedPath.startsWith("storage/session") ||
             normalizedPath.startsWith("storage/sessions") ||
-            normalizedPath.startsWith("storage/framework/sessions")) {
+            normalizedPath.startsWith("storage/framework/sessions") ||
+            (normalizedPath.startsWith("public/") && normalizedPath !== "public/hot") ||
+            normalizedPath.startsWith("resources/js/") ||
+            normalizedPath.startsWith("resources/css/") ||
+            normalizedPath.startsWith("resources/sass/")) {
             return true;
         }
         const normalized = filePath.split(path_1.default.sep);
         return normalized.some((part) => this.ignoredDirs.has(part));
     }
-    startServer(entryFile) {
+    startServer(entryFile, options) {
+        const env = {
+            ...process.env,
+            JCC_SERVE_STRICT_PORT: "1",
+        };
+        if (options.silent) {
+            env.JCC_SERVE_SILENT_RELOAD = "1";
+        }
+        else {
+            delete env.JCC_SERVE_SILENT_RELOAD;
+        }
         this.child = (0, child_process_1.spawn)("bun", [entryFile], {
             cwd: this.rootPath,
             stdio: "inherit",
-            env: process.env,
+            env,
         });
         this.child.on("exit", (code, signal) => {
             if (this.suppressNextExitLog) {
@@ -208,73 +289,133 @@ class WatchCommand {
             }
         });
     }
-    restartServer() {
+    async restartServer() {
         const now = Date.now();
         const elapsed = now - this.lastRestartAt;
         if (elapsed < this.minRestartGapMs) {
             this.restartTimer = setTimeout(() => {
                 this.restartTimer = null;
-                this.restartServer();
+                void this.restartServer();
             }, this.minRestartGapMs - elapsed);
             return;
         }
-        const changedPreview = Array.from(this.pendingChanges).slice(0, 3);
-        const extraCount = this.pendingChanges.size - changedPreview.length;
         this.pendingChanges.clear();
-        const changedText = changedPreview.length === 0
-            ? "unknown"
-            : `${changedPreview.join(", ")}${extraCount > 0 ? ` (+${extraCount} more)` : ""}`;
         this.isRestarting = true;
         this.lastRestartAt = Date.now();
+        await this.stopServer();
+        await this.waitForPortFree(this.getConfiguredPort());
+        this.startServer(path_1.default.resolve(this.rootPath, this.entryFile), {
+            silent: true,
+        });
         this.refreshWatchers();
-        this.stopServer();
-        this.renderServeHeader(this.entryFile, changedText);
-        this.startServer(path_1.default.resolve(this.rootPath, this.entryFile));
         this.isRestarting = false;
     }
-    stopServer() {
-        if (!this.child)
-            return;
-        this.suppressNextExitLog = true;
-        if (process.platform === "win32") {
-            this.child.kill();
+    getConfiguredPort() {
+        const raw = process.env.PORT ?? "5500";
+        const port = Number.parseInt(String(raw), 10);
+        return Number.isFinite(port) && port > 0 ? port : 5500;
+    }
+    isPortFree(port) {
+        return new Promise((resolve) => {
+            const tester = net_1.default.createServer();
+            tester.once("error", () => resolve(false));
+            tester.once("listening", () => {
+                tester.close(() => resolve(true));
+            });
+            tester.listen(port, "127.0.0.1");
+        });
+    }
+    async waitForPortFree(port, timeoutMs = 5000) {
+        const deadline = Date.now() + timeoutMs;
+        while (Date.now() < deadline) {
+            if (await this.isPortFree(port))
+                return;
+            await new Promise((resolve) => setTimeout(resolve, 100));
         }
-        else {
-            this.child.kill("SIGTERM");
+    }
+    stopServer() {
+        const child = this.child;
+        if (!child?.pid) {
+            this.child = null;
+            return Promise.resolve();
         }
-        this.child = null;
+        this.suppressNextExitLog = true;
+        return new Promise((resolve) => {
+            const forceTimer = setTimeout(() => {
+                try {
+                    if (process.platform === "win32") {
+                        child.kill();
+                    }
+                    else {
+                        child.kill("SIGKILL");
+                    }
+                }
+                catch {
+                    /* already dead */
+                }
+                this.child = null;
+                setTimeout(resolve, 150);
+            }, 3000);
+            child.once("exit", () => {
+                clearTimeout(forceTimer);
+                this.child = null;
+                setTimeout(resolve, 150);
+            });
+            try {
+                if (process.platform === "win32") {
+                    child.kill();
+                }
+                else {
+                    child.kill("SIGTERM");
+                }
+            }
+            catch {
+                clearTimeout(forceTimer);
+                this.child = null;
+                this.suppressNextExitLog = false;
+                resolve();
+            }
+        });
     }
     closeWatchers() {
         for (const watcher of this.watchers)
             watcher.close();
         this.watchers = [];
+        this.teardownHotWatcher();
+    }
+    teardownHotWatcher() {
+        const hotPath = path_1.default.join(this.rootPath, "public", "hot");
+        if (this.hotPollTimer) {
+            clearInterval(this.hotPollTimer);
+            this.hotPollTimer = null;
+        }
+        if (this.hotFileActive) {
+            try {
+                fs_1.default.unwatchFile(hotPath);
+            }
+            catch {
+                /* already unwatched */
+            }
+            this.hotFileActive = false;
+        }
     }
     installSignalHandlers() {
-        const shutdown = () => {
+        const shutdown = async () => {
             this.closeWatchers();
-            this.stopServer();
+            await this.stopServer();
             process.exit(0);
         };
-        process.once("SIGINT", shutdown);
-        process.once("SIGTERM", shutdown);
+        process.once("SIGINT", () => {
+            void shutdown();
+        });
+        process.once("SIGTERM", () => {
+            void shutdown();
+        });
     }
-    renderServeHeader(entryLabel, changedText) {
-        this.clearTerminal();
-        if (changedText) {
-            console.log(colors_1.default.gray(`↻ Change detected: ${changedText}`));
-            console.log();
-        }
-        console.log(colors_1.default.green("👀 Watching project for changes..."));
+    renderInitialHeader(entryLabel) {
+        console.log(colors_1.default.green("👀 Serve started (file changes reload silently)."));
         console.log(colors_1.default.cyan(`→ Entry: ${entryLabel}`));
         console.log();
     }
-    clearTerminal() {
-        if (process.stdout.isTTY) {
-            readline_1.default.cursorTo(process.stdout, 0, 0);
-            readline_1.default.clearScreenDown(process.stdout);
-            return;
-        }
-        console.clear();
-    }
 }
 exports.WatchCommand = WatchCommand;

package/lib/Error/AppErrorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAStC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CA0CjB"}
+{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAUtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CA4CjB"}

package/lib/Error/AppErrorHandler.js

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
 const ValidationException_v2_1 = require("./ValidationException-v2");
 const AuthorizationException_1 = require("./AuthorizationException");
 const MissMatchTokenException_1 = require("./MissMatchTokenException");
+const ModelTokenError_1 = require("./ModelExceptions/ModelTokenError");
 class AppErrorHandler {
     constructor(app) {
         this.app = app;
@@ -54,6 +55,9 @@ class AppErrorHandler {
                 }
                 return res.with("Forbidden", "error").status(403).redirectBack();
             }
+            if (err instanceof ModelTokenError_1.ModelTokenError) {
+                return res.status(500).json({ error: err.message });
+            }
             //
             if (err.type === error_1.VALIDATION_ERROR || err instanceof ValidationException_v2_1.ValidationException) {
                 //

package/lib/Error/ModelExceptions/ModelTokenError.d.ts

@@ -0,0 +1,4 @@
+export declare class ModelTokenError extends Error {
+    constructor(message: string);
+}
+//# sourceMappingURL=ModelTokenError.d.ts.map

package/lib/Error/ModelExceptions/ModelTokenError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelTokenError.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Error/ModelExceptions/ModelTokenError.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAI5B"}

package/lib/Error/ModelExceptions/ModelTokenError.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelTokenError = void 0;
+class ModelTokenError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ModelTokenError";
+    }
+}
+exports.ModelTokenError = ModelTokenError;

package/lib/Http/index.d.ts

@@ -6,6 +6,9 @@ export declare class Http extends HttpHeaders {
     private static headers;
     private static body;
     private static resolveParam;
+    private static monitorOutgoingEnabled;
+    private static recordOutgoing;
+    private static trackedRequest;
     static get(url: string, params?: Record<string, any>): Promise<axios.AxiosResponse<any, any, {}>>;
     static post(url: string, data?: Record<string, any> | string): Promise<axios.AxiosResponse<any, any, {}>>;
     static withQueryParameters(params?: Record<string, any>): typeof Http;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Http/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,qBAAa,IAAK,SAAQ,WAAW;IAEnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuB;IAG3C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA2B;IAGrD,OAAO,CAAC,MAAM,CAAC,OAAO,CAA2B;IAGjD,OAAO,CAAC,MAAM,CAAC,IAAI,CAA2B;IAG9C,OAAO,CAAC,MAAM,CAAC,YAAY;IAO3B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAQxD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAW;IAQhE,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAK3D,MAAM,CAAC,QAAQ,CACb,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EAC9B,WAAW,SAA2B;IAOxC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAQxD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAK/C,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAQtD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM;IAQzB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM;IAK7B,MAAM,CAAC,UAAU;IAKjB,oFAAoF;IACpF,MAAM,CAAC,KAAK,IAAI,OAAO,IAAI;CAM5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Http/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,qBAAa,IAAK,SAAQ,WAAW;IAEnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAuB;IAG3C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA2B;IAGrD,OAAO,CAAC,MAAM,CAAC,OAAO,CAA2B;IAGjD,OAAO,CAAC,MAAM,CAAC,IAAI,CAA2B;IAG9C,OAAO,CAAC,MAAM,CAAC,YAAY;IAO3B,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAKrC,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B,OAAO,CAAC,MAAM,CAAC,cAAc;IA6B7B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAUxD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAW;IAUhE,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAK3D,MAAM,CAAC,QAAQ,CACb,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EAC9B,WAAW,SAA2B;IAOxC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAUxD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAK/C,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAUtD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM;IAUzB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM;IAK7B,MAAM,CAAC,UAAU;IAKjB,oFAAoF;IACpF,MAAM,CAAC,KAAK,IAAI,OAAO,IAAI;CAM5B"}

package/lib/Http/index.js

@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Http = void 0;
 const axios_1 = __importDefault(require("axios"));
+const perf_hooks_1 = require("perf_hooks");
+const Monitor_1 = require("../Monitor");
+const MonitorManager_1 = require("../Monitor/MonitorManager");
 const HttpHeader_1 = require("./HttpHeader");
 class Http extends HttpHeader_1.HttpHeaders {
     //
@@ -14,17 +17,50 @@ class Http extends HttpHeader_1.HttpHeaders {
         }
         return url;
     }
+    static monitorOutgoingEnabled() {
+        const mgr = MonitorManager_1.MonitorManager.getInstance();
+        return mgr.config.enabled && mgr.config.collectors.outgoing.enabled;
+    }
+    static recordOutgoing(payload) {
+        if (!this.monitorOutgoingEnabled())
+            return;
+        Monitor_1.Monitor.recordOutgoingRequest({ ...payload, timestamp: Date.now() });
+    }
+    static trackedRequest(method, url, run) {
+        const resolvedUrl = this.resolveParam(url);
+        const startedAt = perf_hooks_1.performance.now();
+        return run()
+            .then((result) => {
+            this.recordOutgoing({
+                method,
+                url: resolvedUrl,
+                status: result?.status ?? 0,
+                durationMs: Number((perf_hooks_1.performance.now() - startedAt).toFixed(2)),
+            });
+            return result;
+        })
+            .catch((error) => {
+            this.recordOutgoing({
+                method,
+                url: resolvedUrl,
+                status: error?.response?.status ?? 0,
+                durationMs: Number((perf_hooks_1.performance.now() - startedAt).toFixed(2)),
+                error: error?.message ?? String(error ?? ""),
+            });
+            throw error;
+        });
+    }
     static get(url, params = {}) {
-        const response = this.axios.get(this.resolveParam(url), {
+        const response = this.trackedRequest("GET", url, () => this.axios.get(this.resolveParam(url), {
             headers: this.headers,
-        });
+        }));
         this.reset();
         return response;
     }
     static post(url, data = {}) {
-        const response = this.axios.post(this.resolveParam(url), data, {
+        const response = this.trackedRequest("POST", url, () => this.axios.post(this.resolveParam(url), data, {
             headers: this.headers,
-        });
+        }));
         this.reset();
         return response;
     }
@@ -38,9 +74,9 @@ class Http extends HttpHeader_1.HttpHeaders {
         return this;
     }
     static patch(url, data = {}) {
-        const response = this.axios.patch(this.resolveParam(url), data, {
+        const response = this.trackedRequest("PATCH", url, () => this.axios.patch(this.resolveParam(url), data, {
             headers: this.headers,
-        });
+        }));
         this.reset();
         return response;
     }
@@ -52,16 +88,16 @@ class Http extends HttpHeader_1.HttpHeaders {
         return this.withHeaders({ "Content-Type": this.HttpHeaders["form-data"] });
     }
     static put(url, data = {}) {
-        const response = this.axios.put(this.resolveParam(url), data, {
+        const response = this.trackedRequest("PUT", url, () => this.axios.put(this.resolveParam(url), data, {
             headers: this.headers,
-        });
+        }));
         this.reset();
         return response;
     }
     static delete(url) {
-        const response = this.axios.delete(this.resolveParam(url), {
+        const response = this.trackedRequest("DELETE", url, () => this.axios.delete(this.resolveParam(url), {
             headers: this.headers,
-        });
+        }));
         this.reset();
         return response;
     }

package/lib/Jcc-eloquent/lib/Model.d.ts

@@ -6,6 +6,7 @@ import { Request } from "express";
 import { CursorPagination, Pagination, SimplePagination } from "./Interfaces";
 export declare class Model extends BaseModel {
     relations: Record<string, any>;
+    protected hasToken: boolean;
     constructor(attributes?: Record<string, any>);
     getTable(): string;
     getKeyName(): string;
@@ -71,5 +72,6 @@ export declare class Model extends BaseModel {
     load(relations: string | string[] | Record<string, Function>): Promise<this>;
     static eventType(): any;
     private static fireEventOnStaticMethod;
+    createToken(payload?: Record<string, any>): any;
 }
 //# sourceMappingURL=Model.d.ts.map

package/lib/Jcc-eloquent/lib/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAKL,OAAO,EAGR,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAK9E,qBAAa,KAAM,SAAQ,SAAS;IAC3B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC3C,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAS;gBACxB,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM;IAOzC,QAAQ,IAAI,MAAM;IAOlB,UAAU,IAAI,MAAM;WAIb,aAAa,IAAI,MAAM;IAI9B,MAAM,IAAI,GAAG;WAOA,QAAQ,CAAC,CAAC,SAAS,KAAK,EAC1C,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAM,GAAG,MAAW,GAC5B,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAkCzB;;;OAGG;WACiB,cAAc,CAAC,CAAC,SAAS,KAAK,EAChD,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAM,GAAG,MAAW,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAM/B;;;OAGG;WACiB,cAAc,CAAC,CAAC,SAAS,KAAK,EAChD,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAM,GAAG,MAAW,EAC7B,MAAM,CAAC,EAAE,MAAM,EACf,SAAS,GAAE,KAAK,GAAG,MAAc,GAChC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAS/B;;OAEG;WACU,MAAM,CAAC,CAAC,SAAS,KAAK,EACjC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,OAAO,CAAC,CAAC,CAAC;IAkBb;;;OAGG;WACiB,cAAc,CAAC,CAAC,SAAS,KAAK,EAChD,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAC/B,OAAO,CAAC,CAAC,CAAC;IAab,wCAAwC;WACpB,cAAc,CAAC,CAAC,SAAS,KAAK,EAChD,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAC/B,OAAO,CAAC,CAAC,CAAC;IAIb;;OAEG;WACiB,MAAM,CAAC,CAAC,SAAS,KAAK,EACxC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC;IAkBf;;OAEG;WAEiB,IAAI,CAAC,CAAC,SAAS,KAAK,EACtC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,EAAE,EAAE,MAAM,GAAG,MAAM,GAClB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;WAMA,GAAG,CAAC,CAAC,SAAS,KAAK,EACrC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,GAC/C,OAAO,CAAC,CAAC,EAAE,CAAC;WAIK,OAAO,CAAC,CAAC,SAAS,KAAK,EACzC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,EAChD,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,EAClB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAM,GAC9C,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAkD1B,OAAO,CAAC,mBAAmB;IAed,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BrB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5B,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;WAS1B,oBAAoB,CAAC,CAAC,EACxC,QAAQ,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,CAAC,CAAC;IAcA,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAmB1B,OAAO;IAQpB,SAAS,CAAC,MAAM,CACd,OAAO,EAAE,OAAO,KAAK,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,GAAE,MAAa,GACtB,wBAAwB;IAU3B,SAAS,CAAC,OAAO,CACf,OAAO,EAAE,OAAO,KAAK,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,GAAE,MAAa,GACtB,wBAAwB;IAU3B,SAAS,CAAC,SAAS,CACjB,OAAO,EAAE,OAAO,KAAK,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,GAAE,MAAa,GACtB,wBAAwB;IAa3B,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,OAAO,KAAK,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,EACxB,eAAe,CAAC,EAAE,MAAM,EACxB,SAAS,GAAE,MAAa,EACxB,UAAU,GAAE,MAAa,GACxB,wBAAwB;IAgC3B,SAAS,CAAC,QAAQ,CAChB,OAAO,EAAE,OAAO,KAAK,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,wBAAwB;IAe3B,SAAS,CAAC,SAAS,CACjB,OAAO,EAAE,OAAO,KAAK,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,wBAAwB;IAe3B,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,KAAK,GAAG,OAAO;IAW7D;;OAEG;WACW,IAAI,CAChB,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GACtD,OAAO;IAIH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAWpC,WAAW,CAAC,IAAI,EAAE,MAAM;IAI/B;;OAEG;IACU,IAAI,CACf,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GACtD,OAAO,CAAC,IAAI,CAAC;IAahB,MAAM,CAAC,SAAS;IAIhB,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAO/B,WAAW,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAyB;CAQxE"}

package/lib/Jcc-eloquent/lib/Model.js

@@ -7,10 +7,14 @@ const utils_1 = require("./utils");
 const ModelEvent_1 = require("./Event/ModelEvent");
 const Relations_1 = require("./Relations");
 const EagerLoading_1 = require("./Relations/EagerLoading");
+const util_1 = require("../../util");
+const ModelTokenError_1 = require("../../Error/ModelExceptions/ModelTokenError");
+//
 class Model extends BaseModel_1.BaseModel {
     constructor(attributes = {}) {
         super();
         this.relations = {};
+        this.hasToken = false;
         this.fill(attributes);
         this.syncOriginal();
         return this.proxy();
@@ -130,7 +134,9 @@ class Model extends BaseModel_1.BaseModel {
      * Executes the query and loads specified relations.
      */
     static async find(id) {
-        return this.query().where("id", id).first();
+        return this.query()
+            .where("id", id || "")
+            .first();
     }
     static async all() {
         return this.query().get();
@@ -380,5 +386,11 @@ class Model extends BaseModel_1.BaseModel {
         }
         return ModelEvent_1.ModelEvent.fireEvent(this.eventType(), event, instance);
     }
+    createToken(payload = { id: this.getKey() }) {
+        if (!this.hasToken) {
+            throw new ModelTokenError_1.ModelTokenError(`${this.constructor.name} Missing required token. Please set 'protected hasToken = true' .`);
+        }
+        return (0, util_1.jwtSign)(payload, { expiresIn: "22h" });
+    }
 }
 exports.Model = Model;

package/lib/Mail/Manager.d.ts

@@ -11,5 +11,7 @@ export declare class MailManager {
     bcc(...emails: string[]): this;
     private getDriver;
     send(mailer: Mailer): Promise<any>;
+    private monitorMailEnabled;
+    private recordMailRun;
 }
 //# sourceMappingURL=Manager.d.ts.map

package/lib/Mail/Manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Mail/Manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAK5C,qBAAa,WAAW;IACtB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAgB;IAErC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAMrC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAM3C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAM5C,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKvB,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAK7B,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAK9B,OAAO,CAAC,SAAS;IAmBX,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAIzC"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Mail/Manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,qBAAa,WAAW;IACtB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAgB;IAErC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAMrC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAM3C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAM5C,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKvB,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAK7B,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAK9B,OAAO,CAAC,SAAS;IAmBX,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IA6BxC,OAAO,CAAC,kBAAkB;YAKZ,aAAa;CAY5B"}

package/lib/Mail/Manager.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailManager = void 0;
 const Config_1 = require("../Config/Config");
+const Monitor_1 = require("../Monitor");
+const MonitorManager_1 = require("../Monitor/MonitorManager");
 const Nodemailer_1 = require("./Drivers/Nodemailer");
 const Resend_1 = require("./Drivers/Resend");
+const perf_hooks_1 = require("perf_hooks");
 class MailManager {
     constructor() {
         this.recipient = "";
@@ -46,8 +49,42 @@ class MailManager {
         return new Nodemailer_1.Nodemailer(this.ccRecipients, this.bccRecipients, this.recipient);
     }
     async send(mailer) {
-        const driver = this.getDriver();
-        return driver.send(mailer);
+        const driverName = Config_1.config.get("MAIL_DRIVER", "smtp").toLowerCase();
+        const startedAt = perf_hooks_1.performance.now();
+        const subject = mailer.subject;
+        try {
+            const driver = this.getDriver();
+            const result = await driver.send(mailer);
+            await this.recordMailRun({
+                to: this.recipient,
+                subject,
+                driver: driverName,
+                status: "sent",
+                durationMs: Number((perf_hooks_1.performance.now() - startedAt).toFixed(2)),
+            });
+            return result;
+        }
+        catch (error) {
+            await this.recordMailRun({
+                to: this.recipient,
+                subject,
+                driver: driverName,
+                status: "failed",
+                durationMs: Number((perf_hooks_1.performance.now() - startedAt).toFixed(2)),
+                error: error instanceof Error ? error.message : String(error ?? ""),
+            });
+            throw error;
+        }
+    }
+    monitorMailEnabled() {
+        const mgr = MonitorManager_1.MonitorManager.getInstance();
+        return mgr.config.enabled && mgr.config.collectors.mail.enabled;
+    }
+    async recordMailRun(payload) {
+        if (!this.monitorMailEnabled())
+            return;
+        Monitor_1.Monitor.recordMail({ ...payload, timestamp: Date.now() });
+        await MonitorManager_1.MonitorManager.getInstance().flush();
     }
 }
 exports.MailManager = MailManager;

package/lib/Monitor/Collectors/CacheCollector.d.ts

@@ -1,14 +1,12 @@
 import type { Collector } from "../interfaces";
 import type { MonitorManager } from "../MonitorManager";
 /**
- * Wraps the framework Cache facade to record hits / misses / writes / forgets.
- * Each operation lands as a CacheOpRecord on the manager. The wrap is
- * idempotent.
+ * Metrics registration for cache operations. The framework Cache class
+ * records hits / misses / writes / forgets via `Monitor.recordCacheOp()`.
  */
 export declare class CacheCollector implements Collector {
     private manager;
     readonly name = "cache";
-    private restore;
     constructor(manager: MonitorManager);
     start(): void;
     stop(): void;

package/lib/Monitor/Collectors/CacheCollector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CacheCollector.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Monitor/Collectors/CacheCollector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;;GAIG;AACH,qBAAa,cAAe,YAAW,SAAS;IAIlC,OAAO,CAAC,OAAO;IAH3B,QAAQ,CAAC,IAAI,WAAW;IACxB,OAAO,CAAC,OAAO,CAA6B;gBAExB,OAAO,EAAE,cAAc;IAE3C,KAAK,IAAI,IAAI;IA4Db,IAAI,IAAI,IAAI;CAMb"}
+{"version":3,"file":"CacheCollector.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Monitor/Collectors/CacheCollector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;GAGG;AACH,qBAAa,cAAe,YAAW,SAAS;IAElC,OAAO,CAAC,OAAO;IAD3B,QAAQ,CAAC,IAAI,WAAW;gBACJ,OAAO,EAAE,cAAc;IAE3C,KAAK,IAAI,IAAI;IAKb,IAAI,IAAI,IAAI;CACb"}