emilsoftware-utilities 2.0.0-dev.4 → 2.0.0-dev.41

package/dist/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"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","sourcesContent":["import winston from \"winston\";\r\nimport * as path from \"path\";\r\nimport { promises as fs } from \"fs\";\r\nimport { blue, red, magenta, green, cyan, yellow } from 'colorette';\r\n\r\nexport enum LogLevels {\r\n    INFO = \"INFO\",\r\n    ERROR = \"ERROR\",\r\n    WARNING = \"WARNING\",\r\n    DEBUG = \"DEBUG\",\r\n    LOG = \"LOG\",\r\n    DATABASE = \"DATABASE\",\r\n}\r\n\r\nexport class Logger {\r\n    private readonly winstonLogger: winston.Logger;\r\n    private readonly tag: string;\r\n    private readonly logDirectory: string;\r\n    private logFormat: winston.Logform.Format;\r\n\r\n    constructor(\r\n        tag: string,\r\n        config?: {\r\n            logDirectory?: string;\r\n            customFormat?: winston.Logform.Format;\r\n            transports?: winston.transport[];\r\n        }\r\n    ) {\r\n        this.tag = tag || \"[UNTAGGED]\";\r\n        this.logDirectory = config?.logDirectory || \"logs\";\r\n\r\n        // Default log format\r\n        this.logFormat =\r\n            config?.customFormat ||\r\n            winston.format.printf(({ timestamp, file, level, message, ...meta }) => {\r\n                return JSON.stringify({\r\n                    timestamp: timestamp || new Date().toISOString(),\r\n                    tag: this.tag,\r\n                    file: this.replaceAll(file + \"\", \"\\\\\", \"/\"),\r\n                    level,\r\n                    message,\r\n                    ...meta,\r\n                });\r\n            });\r\n\r\n        this.initializeDirectory();\r\n\r\n        // Configure logger\r\n        this.winstonLogger = winston.createLogger({\r\n            format: winston.format.combine(winston.format.timestamp(), this.logFormat),\r\n            transports: config?.transports || [\r\n                new winston.transports.File({\r\n                    filename: path.join(this.logDirectory, this.getFileName() + \".json\"),\r\n                }),\r\n            ],\r\n            levels: {\r\n                error: 1,\r\n                warning: 2,\r\n                info: 3,\r\n                http: 4,\r\n                verbose: 5,\r\n                debug: 6,\r\n                silly: 7,\r\n                database: 8,\r\n            },\r\n        });\r\n\r\n        // Add colors for console logging\r\n        winston.addColors({\r\n            database: \"green\",\r\n            error: \"red\",\r\n            warning: \"yellow\",\r\n            info: \"blue\",\r\n            debug: \"magenta\",\r\n            log: \"cyan\",\r\n        });\r\n    }\r\n\r\n    private async initializeDirectory() {\r\n        try {\r\n            const exists = await fs.access(this.logDirectory).then(() => true).catch(() => false);\r\n            if (!exists) {\r\n                await fs.mkdir(this.logDirectory);\r\n            }\r\n        } catch (err) {\r\n            console.error(\"Error initializing log directory:\", err);\r\n        }\r\n    }\r\n\r\n    private getFileName(): string {\r\n        const now = new Date();\r\n        const dateString = now.toISOString().split(\"T\")[0]; // YYYY-MM-DD\r\n        return dateString;\r\n    }\r\n\r\n    private replaceAll(string: string, match: string, replacer: string) {\r\n        return string.split(match).join(replacer);\r\n    }\r\n\r\n    public execStart(prefix: string = \"\"): number {\r\n        this.print(LogLevels.INFO, `${prefix} - Execution started`);\r\n        return performance.now();\r\n    }\r\n\r\n    public execStop(prefix: string = \"\", startTime: number, error: boolean = false): void {\r\n        const executionTime = performance.now() - startTime;\r\n        const message = `${prefix} - Execution ended ${error ? \"due to an error\" : \"successfully\"\r\n            }. Execution time: ${executionTime.toFixed(2)} ms`;\r\n        this.print(error ? LogLevels.ERROR : LogLevels.INFO, message);\r\n    }\r\n\r\n    public info(...data: Object[]): void {\r\n        this.print(LogLevels.INFO, ...data);\r\n    }\r\n\r\n    public dbLog(...data: Object[]): void {\r\n        this.print(LogLevels.DATABASE, ...data);\r\n    }\r\n\r\n    public debug(...data: Object[]): void {\r\n        this.print(LogLevels.DEBUG, ...data);\r\n    }\r\n\r\n    public warning(...data: Object[]): void {\r\n        this.print(LogLevels.WARNING, ...data);\r\n    }\r\n\r\n    public log(...data: Object[]): void {\r\n        this.print(LogLevels.LOG, ...data);\r\n    }\r\n\r\n    public error(...data: Object[]): void {\r\n        this.print(LogLevels.ERROR, ...data);\r\n    }\r\n\r\n    private print(level: LogLevels, ...data: Object[]): void {\r\n        const now: Date = new Date();\r\n        const fileName = this.tag.split(\"\\\\\").pop() || this.tag;\r\n\r\n        // Attach metadata to Winston logger\r\n        this.winstonLogger.defaultMeta = {\r\n            file: fileName,\r\n            time: now,\r\n            level,\r\n        };\r\n\r\n        const logEntry: winston.LogEntry = {\r\n            level: level.toLowerCase(),\r\n            message: [...data].join(\",\"),\r\n        };\r\n\r\n        // Log to console with colors\r\n        switch (level) {\r\n            case LogLevels.INFO:\r\n                console.info(blue(`[INFO][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n            case LogLevels.ERROR:\r\n                console.error(red(`[ERROR][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n            case LogLevels.DEBUG:\r\n                console.debug(magenta(`[DEBUG][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n            case LogLevels.WARNING:\r\n                console.debug(yellow(`[WARNING][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n            case LogLevels.LOG:\r\n                console.log(cyan(`[LOG][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n            case LogLevels.DATABASE:\r\n                console.log(green(`[DATABASE][${now}][${fileName}]`), logEntry.message);\r\n                break;\r\n        }\r\n\r\n        // Log to file\r\n        this.winstonLogger.log(logEntry);\r\n    }\r\n\r\n    public static createLogger(tag: string, config?: { logDirectory?: string }): Logger {\r\n        return new Logger(tag, config);\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,6DAA0D;AAC1D,yCAAoE;AAEpE,IAAY,SAOX;AAPD,WAAY,SAAS;IACjB,0BAAa,CAAA;IACb,4BAAe,CAAA;IACf,gCAAmB,CAAA;IACnB,4BAAe,CAAA;IACf,wBAAW,CAAA;IACX,kCAAqB,CAAA;AACzB,CAAC,EAPW,SAAS,yBAAT,SAAS,QAOpB;AAED,2EAA2E;AAC3E,MAAM,UAAU,GAAG;IACf,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,CAAC;CACd,CAAC;AAEF,yDAAyD;AACzD,MAAM,qBAAqB,GAAG,yEAAyE,CAAC;AACxG,MAAM,QAAQ,GAAG,YAAY,CAAC;AAE9B;;;GAGG;AACH,SAAS,iBAAiB,CAAC,KAAc,EAAE,IAAqB;IAC5D,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5E,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,OAAO,YAAY,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEhB,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,0EAA0E;AAC1E,SAAS,gBAAgB,CAAC,IAAe;IACrC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QACtB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YACzB,OAAO,MAAA,KAAK,CAAC,KAAK,mCAAI,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;QAC5D,CAAC;QACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;QAAC,WAAM,CAAC;YACL,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAED,wEAAwE;AACxE,SAAS,aAAa;IAClB,OAAO,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAiD,EAAE,EAAE;YAArD,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,OAAW,EAAN,IAAI,cAA/C,gDAAiD,CAAF;QAAO,OAAA,IAAI,CAAC,SAAS,iBAC9F,SAAS,EAAE,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAChD,GAAG,EACH,IAAI,EAAE,MAAM,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAC9C,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAC1C,OAAO,IACJ,IAAI,EACT,CAAA;KAAA,CAAC,CAAC;AACR,CAAC;AAED;;;;;;;GAOG;AACH,MAAa,MAAM;IAUf,YACI,GAAW,EACX,MAMC;;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,YAAY,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,MAAM,CAAC;QAEnD,MAAM,eAAe,GAAG,CAAC,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,mCAAI,OAAO,CAAC,GAAG,CAAC,SAAS,mCAAI,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7F,IAAI,CAAC,QAAQ,GAAG,MAAA,UAAU,CAAC,eAA0C,CAAC,mCAAI,UAAU,CAAC,QAAQ,CAAC;QAE9F,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,OAAO,CACjC,iBAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAC1B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,aAAa,EAAE,CAC1C,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU;YACnC,CAAC,CAAC,iBAAO,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YACxG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAE5D,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC3B,iBAAO,CAAC,SAAS,CAAC;gBACd,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,QAAQ;gBACjB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,MAAM;aACd,CAAC,CAAC;YACH,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACnC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,mBAAmB,CAAC,YAAoB,EAAE,MAA8B;QACnF,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;YAChC,KAAK,EAAE,UAAU;YACjB,MAAM;YACN,UAAU,EAAE,CAAC,IAAI,uCAAkB,CAAC,YAAY,CAAC,CAAC;YAClD,MAAM,EAAE,UAAU;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,SAAS,CAAC,SAAiB,EAAE;QAChC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,MAAM,sBAAsB,CAAC,CAAC;QAC5D,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,QAAQ,CAAC,SAAiB,EAAE,EAAE,SAAiB,EAAE,QAAiB,KAAK;QAC1E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QACpD,MAAM,OAAO,GAAG,GAAG,MAAM,sBAAsB,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cACvE,qBAAqB,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAEM,IAAI,CAAC,GAAG,IAAe;QAC1B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,GAAG,IAAe;QAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,GAAG,IAAe;QAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACzC,CAAC;IAEM,OAAO,CAAC,GAAG,IAAe;QAC7B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEM,GAAG,CAAC,GAAG,IAAe;QACzB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,GAAG,IAAe;QAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,KAAgB,EAAE,GAAG,IAAe;;QAC9C,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAA,UAAU,CAAC,KAAK,CAAC,WAAW,EAA6B,CAAC,mCAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChJ,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QAED,MAAM,GAAG,GAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC;QACxD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAEvC,wDAAwD;QACxD,QAAQ,KAAK,EAAE,CAAC;YACZ,KAAK,SAAS,CAAC,IAAI;gBACf,OAAO,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,UAAU,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC3D,MAAM;YACV,KAAK,SAAS,CAAC,KAAK;gBAChB,OAAO,CAAC,KAAK,CAAC,IAAA,eAAG,EAAC,WAAW,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC5D,MAAM;YACV,KAAK,SAAS,CAAC,KAAK;gBAChB,OAAO,CAAC,KAAK,CAAC,IAAA,mBAAO,EAAC,WAAW,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBAChE,MAAM;YACV,KAAK,SAAS,CAAC,OAAO;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAA,kBAAM,EAAC,aAAa,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBACjE,MAAM;YACV,KAAK,SAAS,CAAC,GAAG;gBACd,OAAO,CAAC,GAAG,CAAC,IAAA,gBAAI,EAAC,SAAS,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBACzD,MAAM;YACV,KAAK,SAAS,CAAC,QAAQ;gBACnB,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAK,EAAC,cAAc,GAAG,KAAK,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC/D,MAAM;QACd,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;YACnB,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE;YAChE,OAAO;YACP,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,GAAG;SACZ,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,GAAW,EAAE,MAAkC;QACtE,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;;AA/IL,wBAgJC;AA1IG,0FAA0F;AAClE,oBAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;AAC3D,uBAAgB,GAAG,KAAK,CAAC","sourcesContent":["import winston from \"winston\";\nimport { DailyFileTransport } from './DailyFileTransport';\nimport { blue, red, magenta, green, cyan, yellow } from 'colorette';\n\nexport enum LogLevels {\n    INFO = \"INFO\",\n    ERROR = \"ERROR\",\n    WARNING = \"WARNING\",\n    DEBUG = \"DEBUG\",\n    LOG = \"LOG\",\n    DATABASE = \"DATABASE\",\n}\n\n/** Livelli winston usati dal logger (comprende `database` e `general`). */\nconst WIN_LEVELS = {\n    error: 1,\n    warning: 2,\n    info: 3,\n    general: 3,\n    http: 4,\n    verbose: 5,\n    debug: 6,\n    silly: 7,\n    database: 8,\n};\n\n/** Chiavi i cui valori non devono mai finire nei log. */\nconst SENSITIVE_KEY_PATTERN = /(password|passwd|pwd|secret|token|authorization|apikey|api_key|cookie)/i;\nconst REDACTED = '[REDACTED]';\n\n/**\n * Serializza un valore per il log, redigendo i campi sensibili e risolvendo\n * `Error` e riferimenti circolari (che altrimenti diventano `[object Object]`).\n */\nfunction serializeLogValue(value: unknown, seen: WeakSet<object>): unknown {\n    if (value instanceof Error) {\n        return { name: value.name, message: value.message, stack: value.stack };\n    }\n\n    if (Array.isArray(value)) {\n        return value.map((item) => serializeLogValue(item, seen));\n    }\n\n    if (value && typeof value === 'object') {\n        if (seen.has(value)) {\n            return '[Circular]';\n        }\n        seen.add(value);\n\n        const result: Record<string, unknown> = {};\n        for (const [key, nested] of Object.entries(value as Record<string, unknown>)) {\n            result[key] = SENSITIVE_KEY_PATTERN.test(key) ? REDACTED : serializeLogValue(nested, seen);\n        }\n        return result;\n    }\n\n    return value;\n}\n\n/** Costruisce il messaggio testuale del log a partire dagli argomenti. */\nfunction stringifyLogData(data: unknown[]): string {\n    return data.map((value) => {\n        if (typeof value === 'string') {\n            return value;\n        }\n        if (value instanceof Error) {\n            return value.stack ?? `${value.name}: ${value.message}`;\n        }\n        if (value === undefined) {\n            return 'undefined';\n        }\n        if (value === null) {\n            return 'null';\n        }\n        try {\n            return JSON.stringify(serializeLogValue(value, new WeakSet()));\n        } catch {\n            return String(value);\n        }\n    }).join(', ');\n}\n\n/** Formato condiviso: JSON a una riga, con tag/file/level/messaggio. */\nfunction defaultFormat(): winston.Logform.Format {\n    return winston.format.printf(({ timestamp, tag, file, level, message, ...meta }) => JSON.stringify({\n        timestamp: timestamp || new Date().toISOString(),\n        tag,\n        file: String(file ?? '').split('\\\\').join('/'),\n        level: level === 'general' ? 'log' : level,\n        message,\n        ...meta,\n    }));\n}\n\n/**\n * Logger strutturato dell'applicazione.\n *\n * - I log finiscono su console (colorati) e su file JSON giornaliero.\n * - Le istanze con la stessa `logDirectory` condividono un unico logger winston\n *   (un solo transport/timer), evitando di crearne uno per classe.\n * - I campi sensibili (password, token, secret, ...) sono redatti automaticamente.\n */\nexport class Logger {\n    private readonly winstonLogger: winston.Logger;\n    private readonly tag: string;\n    private readonly logDirectory: string;\n    private readonly maxLevel: number;\n\n    /** Logger winston condivisi per directory, così da non moltiplicare transport e timer. */\n    private static readonly sharedLoggers = new Map<string, winston.Logger>();\n    private static colorsRegistered = false;\n\n    constructor(\n        tag: string,\n        config?: {\n            logDirectory?: string;\n            customFormat?: winston.Logform.Format;\n            transports?: winston.transport[];\n            /** Livello minimo loggato: `error`..`database` (default `database`, ovvero tutto). Override con `LOG_LEVEL`. */\n            level?: string;\n        }\n    ) {\n        this.tag = tag || \"[UNTAGGED]\";\n        this.logDirectory = config?.logDirectory || \"logs\";\n\n        const configuredLevel = (config?.level ?? process.env.LOG_LEVEL ?? 'database').toLowerCase();\n        this.maxLevel = WIN_LEVELS[configuredLevel as keyof typeof WIN_LEVELS] ?? WIN_LEVELS.database;\n\n        const format = winston.format.combine(\n            winston.format.timestamp(),\n            config?.customFormat || defaultFormat(),\n        );\n\n        this.winstonLogger = config?.transports\n            ? winston.createLogger({ level: 'database', format, transports: config.transports, levels: WIN_LEVELS })\n            : Logger.resolveSharedLogger(this.logDirectory, format);\n\n        if (!Logger.colorsRegistered) {\n            winston.addColors({\n                database: \"green\",\n                error: \"red\",\n                warning: \"yellow\",\n                info: \"blue\",\n                debug: \"magenta\",\n                log: \"cyan\",\n            });\n            Logger.colorsRegistered = true;\n        }\n    }\n\n    private static resolveSharedLogger(logDirectory: string, format: winston.Logform.Format): winston.Logger {\n        const existing = Logger.sharedLoggers.get(logDirectory);\n        if (existing) {\n            return existing;\n        }\n\n        const logger = winston.createLogger({\n            level: 'database',\n            format,\n            transports: [new DailyFileTransport(logDirectory)],\n            levels: WIN_LEVELS,\n        });\n        Logger.sharedLoggers.set(logDirectory, logger);\n        return logger;\n    }\n\n    public execStart(prefix: string = \"\"): number {\n        this.print(LogLevels.INFO, `${prefix} - Execution started`);\n        return performance.now();\n    }\n\n    public execStop(prefix: string = \"\", startTime: number, error: boolean = false): void {\n        const executionTime = performance.now() - startTime;\n        const message = `${prefix} - Execution ended ${error ? \"due to an error\" : \"successfully\"\n            }. Execution time: ${executionTime.toFixed(2)} ms`;\n        this.print(error ? LogLevels.ERROR : LogLevels.INFO, message);\n    }\n\n    public info(...data: unknown[]): void {\n        this.print(LogLevels.INFO, ...data);\n    }\n\n    public dbLog(...data: unknown[]): void {\n        this.print(LogLevels.DATABASE, ...data);\n    }\n\n    public debug(...data: unknown[]): void {\n        this.print(LogLevels.DEBUG, ...data);\n    }\n\n    public warning(...data: unknown[]): void {\n        this.print(LogLevels.WARNING, ...data);\n    }\n\n    public log(...data: unknown[]): void {\n        this.print(LogLevels.LOG, ...data);\n    }\n\n    public error(...data: unknown[]): void {\n        this.print(LogLevels.ERROR, ...data);\n    }\n\n    private print(level: LogLevels, ...data: unknown[]): void {\n        const rank = level === LogLevels.LOG ? WIN_LEVELS.general : (WIN_LEVELS[level.toLowerCase() as keyof typeof WIN_LEVELS] ?? WIN_LEVELS.database);\n        if (rank > this.maxLevel) {\n            return;\n        }\n\n        const now: Date = new Date();\n        const fileName = this.tag.split(\"\\\\\").pop() || this.tag;\n        const message = stringifyLogData(data);\n\n        // Console colorata (il livello file resta strutturato).\n        switch (level) {\n            case LogLevels.INFO:\n                console.info(blue(`[INFO][${now}][${fileName}]`), message);\n                break;\n            case LogLevels.ERROR:\n                console.error(red(`[ERROR][${now}][${fileName}]`), message);\n                break;\n            case LogLevels.DEBUG:\n                console.debug(magenta(`[DEBUG][${now}][${fileName}]`), message);\n                break;\n            case LogLevels.WARNING:\n                console.debug(yellow(`[WARNING][${now}][${fileName}]`), message);\n                break;\n            case LogLevels.LOG:\n                console.log(cyan(`[LOG][${now}][${fileName}]`), message);\n                break;\n            case LogLevels.DATABASE:\n                console.log(green(`[DATABASE][${now}][${fileName}]`), message);\n                break;\n        }\n\n        this.winstonLogger.log({\n            level: level === LogLevels.LOG ? 'general' : level.toLowerCase(),\n            message,\n            tag: this.tag,\n            file: fileName,\n            time: now,\n        });\n    }\n\n    public static createLogger(tag: string, config?: { logDirectory?: string }): Logger {\n        return new Logger(tag, config);\n    }\n}\n"]}

package/dist/Orm.d.ts

@@ -1,28 +1,44 @@
-import { Database, Options, Transaction } from "es-node-firebird";
+import { Database, Options, QueryParams, Transaction } from "node-firebird";
 export declare class Orm {
     private static logger;
-    private static compatibilityProfileCache;
+    private static pools;
     static quote(value: string): string;
+    /** Dimensione pool: default 5 (pool attivo); `poolSize: 0` disabilita e torna all'attach per query. */
+    private static getPoolSize;
+    private static shouldLogQueryParameters;
+    private static formatQueryForLog;
+    private static buildPoolKey;
+    /**
+     * Chiude tutti i pool creati (opt-in `poolSize`). Utile a fine processo o nei test,
+     * perché i pool mantengono connessioni e timer attivi.
+     */
+    static closePools(): Promise<void>;
+    private static getPool;
     private static getTimeoutMs;
     private static createTimeoutError;
-    private static createCompatibilityCacheKey;
-    private static getProbeTimeoutMs;
-    private static reorderCandidatesWithCache;
-    private static createCompatibilitySummaryError;
     private static detachQuietly;
-    private static attachOnceWithTimeout;
+    private static shouldTrimStringResults;
+    private static normalizeResultValue;
     private static attachWithTimeout;
     static testConnection(options: Options): Promise<boolean>;
-    static query(options: Options, query: string, parameters?: any[], logQuery?: boolean): Promise<any>;
-    static execute(options: Options, query: string, parameters?: any, logQuery?: boolean): Promise<any>;
-    static trimParam(param: any): string;
+    static query<T = Record<string, unknown>>(options: Options, query: string, parameters?: QueryParams, logQuery?: boolean): Promise<T[]>;
+    static execute<T = Record<string, unknown>>(options: Options, query: string, parameters?: QueryParams, logQuery?: boolean): Promise<T[]>;
+    static trimParam<T>(param: T): string | T;
     static connect(options: Options): Promise<Database>;
+    /**
+     * Runs `operation` inside a single Firebird transaction: commit on success,
+     * rollback on failure, detach in every case. Use it to make multi-statement
+     * writes atomic instead of relying on auto-commit per statement.
+     */
+    static withTransaction<T>(options: Options, operation: (transaction: Transaction) => Promise<T>): Promise<T>;
+    /** Esegue una query su una transazione esistente e ne restituisce il risultato. */
+    static transactionQuery<T = unknown>(transaction: Transaction, query: string, parameters?: QueryParams): Promise<T>;
     static startTransaction(db: Database): Promise<Transaction>;
     static commitTransaction(transaction: Transaction): Promise<string>;
     static rollbackTransaction(transaction: Transaction): Promise<string>;
     static executeMultiple(options: Options, queriesWithParams: {
         query: string;
-        params: any[];
+        params: QueryParams;
     }[]): Promise<string>;
-    static executeQueries(transaction: Transaction, queries: string[], params: any[]): Promise<any>;
+    static executeQueries(transaction: Transaction, queries: string[], params: QueryParams[]): Promise<unknown>;
 }

package/dist/Orm.js

@@ -43,73 +43,88 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Orm = void 0;
-const Firebird = __importStar(require("es-node-firebird"));
+const Firebird = __importStar(require("node-firebird"));
 const Logger_1 = require("./Logger");
 const Utilities_1 = require("./Utilities");
 const firebird_compat_1 = require("./firebird-compat");
-(0, firebird_compat_1.ensureEsNodeFirebirdCompatibilityPatch)();
 class Orm {
     static quote(value) {
         return "\"" + value + "\"";
     }
-    static getTimeoutMs(options) {
-        var _a, _b, _c;
-        const candidate = (_c = (_b = (_a = options.connectTimeoutMs) !== null && _a !== void 0 ? _a : options.compatibilityTotalTimeoutMs) !== null && _b !== void 0 ? _b : options.connectTimeout) !== null && _c !== void 0 ? _c : 15000;
-        return Number.isFinite(candidate) && candidate > 0 ? Math.trunc(candidate) : 15000;
+    /** Dimensione pool: default 5 (pool attivo); `poolSize: 0` disabilita e torna all'attach per query. */
+    static getPoolSize(options) {
+        const raw = options.poolSize;
+        if (raw === 0) {
+            return 0;
+        }
+        const size = raw === undefined ? 5 : Number(raw);
+        return Number.isFinite(size) && size > 0 ? Math.trunc(size) : 0;
     }
-    static createTimeoutError(stage, timeoutMs, options, query) {
-        var _a, _b, _c;
-        const target = `${(_a = options.host) !== null && _a !== void 0 ? _a : "?"}:${(_b = options.port) !== null && _b !== void 0 ? _b : "?"} -> ${(_c = options.database) !== null && _c !== void 0 ? _c : "?"}`;
-        const suffix = query ? ` | sql=${query.replace(/\s+/g, " ").trim()}` : "";
-        return new Error(`Timeout during Firebird ${stage} after ${timeoutMs} ms on ${target}${suffix}`);
+    static shouldLogQueryParameters(options) {
+        return options.logQueryParameters === true;
     }
-    static createCompatibilityCacheKey(options) {
-        var _a, _b, _c, _d;
+    static formatQueryForLog(query, parameters, includeValues) {
+        const parameterList = Array.isArray(parameters) ? parameters : Object.values(parameters !== null && parameters !== void 0 ? parameters : {});
+        if (includeValues) {
+            return Utilities_1.RestUtilities.printQueryWithParams(query, parameterList);
+        }
+        return `${query.replace(/\s+/g, " ").trim()} [params=${parameterList.length}]`;
+    }
+    static buildPoolKey(options, size) {
+        var _a, _b, _c, _d, _e, _f;
+        const normalized = (0, firebird_compat_1.normalizeFirebirdOptions)(options);
         return [
-            (_a = options.host) !== null && _a !== void 0 ? _a : "?",
-            (_b = options.port) !== null && _b !== void 0 ? _b : "?",
-            (_c = options.database) !== null && _c !== void 0 ? _c : "?",
-            (_d = options.user) !== null && _d !== void 0 ? _d : "?",
+            size,
+            (_a = normalized.host) !== null && _a !== void 0 ? _a : "",
+            (_b = normalized.port) !== null && _b !== void 0 ? _b : "",
+            (_c = normalized.database) !== null && _c !== void 0 ? _c : "",
+            (_d = normalized.user) !== null && _d !== void 0 ? _d : "",
+            (_e = normalized.pluginName) !== null && _e !== void 0 ? _e : "",
+            String((_f = normalized.wireCrypt) !== null && _f !== void 0 ? _f : ""),
         ].join("|");
     }
-    static getProbeTimeoutMs(options, candidateCount) {
-        const configured = options.compatibilityProbeTimeoutMs;
-        if (Number.isFinite(configured) && configured > 0) {
-            return Math.trunc(configured);
-        }
-        const totalTimeoutMs = this.getTimeoutMs(options);
-        if (candidateCount <= 1) {
-            return totalTimeoutMs;
-        }
-        return Math.max(2500, Math.min(5000, Math.trunc(totalTimeoutMs / candidateCount)));
+    /**
+     * Chiude tutti i pool creati (opt-in `poolSize`). Utile a fine processo o nei test,
+     * perché i pool mantengono connessioni e timer attivi.
+     */
+    static closePools() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const pools = Array.from(this.pools.values());
+            this.pools.clear();
+            yield Promise.all(pools.map((pool) => new Promise((resolve) => {
+                try {
+                    pool.destroy(() => resolve());
+                }
+                catch (_a) {
+                    resolve();
+                }
+            })));
+        });
     }
-    static reorderCandidatesWithCache(options, candidates) {
-        const cacheKey = this.createCompatibilityCacheKey(options);
-        const cachedCandidate = this.compatibilityProfileCache.get(cacheKey);
-        if (!cachedCandidate) {
-            return candidates;
-        }
-        const ordered = [...candidates];
-        const cachedDescription = (0, firebird_compat_1.describeFirebirdCompatibilityOptions)(cachedCandidate);
-        const cachedIndex = ordered.findIndex((candidate) => (0, firebird_compat_1.describeFirebirdCompatibilityOptions)(candidate) === cachedDescription);
-        if (cachedIndex <= 0) {
-            return ordered;
+    static getPool(options, size) {
+        const normalized = (0, firebird_compat_1.normalizeFirebirdOptions)(options);
+        const key = this.buildPoolKey(normalized, size);
+        let pool = this.pools.get(key);
+        if (!pool) {
+            this.logger.info(`Firebird pool created (max=${size}) using ${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(normalized)}`);
+            pool = Firebird.pool(size, normalized);
+            pool.on("error", (error) => {
+                this.logger.error(`Firebird pool error: ${error.message}`);
+            });
+            this.pools.set(key, pool);
         }
-        const [matchedCandidate] = ordered.splice(cachedIndex, 1);
-        ordered.unshift(matchedCandidate);
-        return ordered;
+        return pool;
+    }
+    static getTimeoutMs(options) {
+        var _a;
+        const candidate = (_a = options.connectTimeout) !== null && _a !== void 0 ? _a : 15000;
+        return Number.isFinite(candidate) && candidate > 0 ? Math.trunc(candidate) : 15000;
     }
-    static createCompatibilitySummaryError(options, attempts) {
+    static createTimeoutError(stage, timeoutMs, options, query) {
         var _a, _b, _c;
         const target = `${(_a = options.host) !== null && _a !== void 0 ? _a : "?"}:${(_b = options.port) !== null && _b !== void 0 ? _b : "?"} -> ${(_c = options.database) !== null && _c !== void 0 ? _c : "?"}`;
-        const attemptsSummary = attempts
-            .map(({ candidate, error }) => {
-            var _a, _b;
-            const errorMessage = String((_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error) !== null && _b !== void 0 ? _b : "Unknown error");
-            return `[${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(candidate)} => ${errorMessage}]`;
-        })
-            .join("; ");
-        return new Error(`Unable to attach Firebird database after compatibility probing on ${target}. Attempts: ${attemptsSummary}`);
+        const suffix = query ? ` | sql=${query.replace(/\s+/g, " ").trim()}` : "";
+        return new Error(`Timeout during Firebird ${stage} after ${timeoutMs} ms on ${target}${suffix}`);
     }
     static detachQuietly(db) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -126,17 +141,45 @@ class Orm {
             });
         });
     }
-    static attachOnceWithTimeout(options, timeoutMs = this.getTimeoutMs(options)) {
+    static shouldTrimStringResults(options) {
+        return options.trimStringResults !== false;
+    }
+    static normalizeResultValue(value, trimStringResults) {
+        if (!trimStringResults || value === undefined || value === null) {
+            return value;
+        }
+        if (typeof value === "string" || value instanceof String) {
+            return String(value).trimEnd();
+        }
+        if (Array.isArray(value)) {
+            return value.map((item) => this.normalizeResultValue(item, trimStringResults));
+        }
+        if (value instanceof Date || Buffer.isBuffer(value)) {
+            return value;
+        }
+        if (typeof value === "object") {
+            const source = value;
+            return Object.keys(source).reduce((normalized, key) => {
+                normalized[key] = this.normalizeResultValue(source[key], trimStringResults);
+                return normalized;
+            }, {});
+        }
+        return value;
+    }
+    static attachWithTimeout(options) {
         return new Promise((resolve, reject) => {
+            const normalizedOptions = (0, firebird_compat_1.normalizeFirebirdOptions)(options);
+            const timeoutMs = this.getTimeoutMs(normalizedOptions);
+            const poolSize = this.getPoolSize(options);
             let settled = false;
             const timeoutId = setTimeout(() => {
                 if (settled) {
                     return;
                 }
                 settled = true;
-                reject(this.createTimeoutError("attach", timeoutMs, options));
+                reject((0, firebird_compat_1.enhanceFirebirdError)(this.createTimeoutError("attach", timeoutMs, normalizedOptions), normalizedOptions, { stage: "attach" }));
             }, timeoutMs);
-            Firebird.attach(options, (err, db) => __awaiter(this, void 0, void 0, function* () {
+            const handle = (err, db) => __awaiter(this, void 0, void 0, function* () {
                 if (settled) {
                     yield this.detachQuietly(db);
                     return;
@@ -144,52 +187,26 @@ class Orm {
                 settled = true;
                 clearTimeout(timeoutId);
                 if (err) {
-                    this.logger.error(err);
-                    return reject(err);
+                    return reject((0, firebird_compat_1.enhanceFirebirdError)(err, normalizedOptions, { stage: "attach" }));
                 }
                 return resolve(db);
-            }));
-        });
-    }
-    static attachWithTimeout(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const totalTimeoutMs = this.getTimeoutMs(options);
-            const candidates = this.reorderCandidatesWithCache(options, (0, firebird_compat_1.buildFirebirdCompatibilityCandidates)(options));
-            const probeTimeoutMs = this.getProbeTimeoutMs(options, candidates.length);
-            const startedAt = Date.now();
-            const attempts = [];
-            const cacheKey = this.createCompatibilityCacheKey(options);
-            for (let index = 0; index < candidates.length; index++) {
-                const candidate = candidates[index];
-                const elapsedMs = Date.now() - startedAt;
-                const remainingMs = totalTimeoutMs - elapsedMs;
-                if (remainingMs <= 0) {
-                    break;
-                }
-                const attemptTimeoutMs = index === 0 && candidates.length === 1
-                    ? remainingMs
-                    : Math.min(probeTimeoutMs, remainingMs);
-                try {
-                    if (candidates.length > 1) {
-                        this.logger.info(`Firebird compatibility probe ${index + 1}/${candidates.length}: ${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(candidate)} (timeout ${attemptTimeoutMs} ms)`);
-                    }
-                    const db = yield this.attachOnceWithTimeout(candidate, attemptTimeoutMs);
-                    this.compatibilityProfileCache.set(cacheKey, candidate);
-                    if (candidates.length > 1) {
-                        this.logger.info(`Firebird compatibility profile selected: ${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(candidate)}`);
-                    }
-                    return db;
+            });
+            try {
+                if (poolSize > 0) {
+                    this.getPool(options, poolSize).get(handle);
+                    return;
                 }
-                catch (error) {
-                    attempts.push({ candidate, error });
-                    if (!(0, firebird_compat_1.shouldRetryFirebirdCompatibility)(error) || index === candidates.length - 1) {
-                        throw this.createCompatibilitySummaryError(options, attempts);
-                    }
-                    this.logger.warning(`Firebird attach failed with ${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(candidate)}. Trying next compatibility profile. Error: ${String((_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error)}`);
+                this.logger.info(`Firebird attach using ${(0, firebird_compat_1.describeFirebirdCompatibilityOptions)(normalizedOptions)}`);
+                Firebird.attach(normalizedOptions, handle);
+            }
+            catch (error) {
+                // Attach/get sincrono fallito: evita di lasciare il timer di timeout pendente.
+                if (!settled) {
+                    settled = true;
+                    clearTimeout(timeoutId);
+                    reject((0, firebird_compat_1.enhanceFirebirdError)(error, normalizedOptions, { stage: "attach" }));
                 }
             }
-            throw this.createCompatibilitySummaryError(options, attempts);
         });
     }
     static testConnection(options) {
@@ -212,9 +229,10 @@ class Orm {
     static query(options_1, query_1) {
         return __awaiter(this, arguments, void 0, function* (options, query, parameters = [], logQuery = true) {
             try {
+                const normalizedOptions = (0, firebird_compat_1.normalizeFirebirdOptions)(options);
                 const db = yield this.attachWithTimeout(options);
                 return yield new Promise((resolve, reject) => {
-                    const timeoutMs = this.getTimeoutMs(options);
+                    const timeoutMs = this.getTimeoutMs(normalizedOptions);
                     let settled = false;
                     const timeoutId = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                         if (settled) {
@@ -222,10 +240,10 @@ class Orm {
                         }
                         settled = true;
                         yield this.detachQuietly(db);
-                        reject(this.createTimeoutError("query", timeoutMs, options, query));
+                        reject((0, firebird_compat_1.enhanceFirebirdError)(this.createTimeoutError("query", timeoutMs, normalizedOptions, query), normalizedOptions, { stage: "query", sql: query }));
                     }), timeoutMs);
                     if (logQuery) {
-                        this.logger.info(Utilities_1.RestUtilities.printQueryWithParams(query, parameters));
+                        this.logger.info(this.formatQueryForLog(query, parameters, this.shouldLogQueryParameters(options)));
                     }
                     db.query(query, parameters, (error, result) => __awaiter(this, void 0, void 0, function* () {
                         if (settled) {
@@ -236,25 +254,26 @@ class Orm {
                         clearTimeout(timeoutId);
                         yield this.detachQuietly(db);
                         if (error) {
-                            this.logger.error(error);
-                            return reject(error);
+                            return reject((0, firebird_compat_1.enhanceFirebirdError)(error, normalizedOptions, { stage: "query", sql: query }));
                         }
-                        return resolve(result);
+                        return resolve(this.normalizeResultValue(result, this.shouldTrimStringResults(normalizedOptions)));
                     }));
                 });
             }
             catch (error) {
-                this.logger.error(error);
-                throw error;
+                const normalizedError = (0, firebird_compat_1.enhanceFirebirdError)(error, options, { stage: "query", sql: query });
+                this.logger.error(normalizedError);
+                throw normalizedError;
             }
         });
     }
     static execute(options_1, query_1) {
         return __awaiter(this, arguments, void 0, function* (options, query, parameters = [], logQuery = true) {
             try {
+                const normalizedOptions = (0, firebird_compat_1.normalizeFirebirdOptions)(options);
                 const db = yield this.attachWithTimeout(options);
                 return yield new Promise((resolve, reject) => {
-                    const timeoutMs = this.getTimeoutMs(options);
+                    const timeoutMs = this.getTimeoutMs(normalizedOptions);
                     let settled = false;
                     const timeoutId = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                         if (settled) {
@@ -262,10 +281,10 @@ class Orm {
                         }
                         settled = true;
                         yield this.detachQuietly(db);
-                        reject(this.createTimeoutError("execute", timeoutMs, options, query));
+                        reject((0, firebird_compat_1.enhanceFirebirdError)(this.createTimeoutError("execute", timeoutMs, normalizedOptions, query), normalizedOptions, { stage: "execute", sql: query }));
                     }), timeoutMs);
                     if (logQuery) {
-                        this.logger.info(Utilities_1.RestUtilities.printQueryWithParams(query, parameters));
+                        this.logger.info(this.formatQueryForLog(query, parameters, this.shouldLogQueryParameters(options)));
                     }
                     db.execute(query, parameters, (error, result) => __awaiter(this, void 0, void 0, function* () {
                         if (settled) {
@@ -276,22 +295,22 @@ class Orm {
                         clearTimeout(timeoutId);
                         yield this.detachQuietly(db);
                         if (error) {
-                            this.logger.error(error);
-                            return reject(error);
+                            return reject((0, firebird_compat_1.enhanceFirebirdError)(error, normalizedOptions, { stage: "execute", sql: query }));
                         }
-                        return resolve(result);
+                        return resolve(this.normalizeResultValue(result, this.shouldTrimStringResults(normalizedOptions)));
                     }));
                 });
             }
             catch (error) {
-                this.logger.error(error);
-                throw error;
+                const normalizedError = (0, firebird_compat_1.enhanceFirebirdError)(error, options, { stage: "execute", sql: query });
+                this.logger.error(normalizedError);
+                throw normalizedError;
             }
         });
     }
     static trimParam(param) {
         if (typeof param === "string" || param instanceof String) {
-            return param.trim();
+            return String(param).trim();
         }
         return param;
     }
@@ -300,14 +319,57 @@ class Orm {
             return this.attachWithTimeout(options);
         });
     }
+    /**
+     * Runs `operation` inside a single Firebird transaction: commit on success,
+     * rollback on failure, detach in every case. Use it to make multi-statement
+     * writes atomic instead of relying on auto-commit per statement.
+     */
+    static withTransaction(options, operation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const db = yield this.connect(options);
+            let transaction;
+            try {
+                transaction = yield this.startTransaction(db);
+                const result = yield operation(transaction);
+                yield this.commitTransaction(transaction);
+                return result;
+            }
+            catch (error) {
+                if (transaction) {
+                    try {
+                        yield this.rollbackTransaction(transaction);
+                    }
+                    catch (_a) {
+                        // Se la rollback fallisce (connessione persa) l'errore originale resta quello rilevante.
+                    }
+                }
+                throw error;
+            }
+            finally {
+                yield this.detachQuietly(db);
+            }
+        });
+    }
+    /** Esegue una query su una transazione esistente e ne restituisce il risultato. */
+    static transactionQuery(transaction, query, parameters = []) {
+        return new Promise((resolve, reject) => {
+            transaction.query(query, parameters, (error, result) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                resolve(result);
+            });
+        });
+    }
     static startTransaction(db) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 db.transaction(Firebird.ISOLATION_READ_COMMITTED, function (err, transaction) {
-                    if (err)
+                    if (err) {
                         return reject(err);
-                    else
-                        return resolve(transaction);
+                    }
+                    return resolve(transaction);
                 });
             });
         });
@@ -316,10 +378,10 @@ class Orm {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 transaction.commit((err) => {
-                    if (err)
+                    if (err) {
                         return reject(err);
-                    else
-                        return resolve("Transaction committed successfully.");
+                    }
+                    return resolve("Transaction committed successfully.");
                 });
             });
         });
@@ -328,42 +390,22 @@ class Orm {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 transaction.rollback((err) => {
-                    if (err)
+                    if (err) {
                         return reject(err);
-                    else
-                        return resolve("Transaction rolled back successfully.");
+                    }
+                    return resolve("Transaction rolled back successfully.");
                 });
             });
         });
     }
     static executeMultiple(options, queriesWithParams) {
         return __awaiter(this, void 0, void 0, function* () {
-            let db;
-            let transaction;
-            try {
-                db = yield Orm.connect(options);
-                transaction = yield Orm.startTransaction(db);
+            yield Orm.withTransaction(options, (transaction) => __awaiter(this, void 0, void 0, function* () {
                 for (const qwp of queriesWithParams) {
-                    yield new Promise((resolve, reject) => {
-                        transaction.query(qwp.query, qwp.params, (err, result) => {
-                            if (err)
-                                return reject(err);
-                            else
-                                return resolve(result);
-                        });
-                    });
-                }
-                yield Orm.commitTransaction(transaction);
-                yield Orm.detachQuietly(db);
-                return "OK";
-            }
-            catch (error) {
-                if (transaction) {
-                    yield Orm.rollbackTransaction(transaction);
+                    yield Orm.transactionQuery(transaction, qwp.query, qwp.params);
                 }
-                yield Orm.detachQuietly(db);
-                throw error;
-            }
+            }));
+            return "OK";
         });
     }
     static executeQueries(transaction, queries, params) {
@@ -371,24 +413,23 @@ class Orm {
             try {
                 return yield queries.reduce((promiseChain, currentQuery, index) => {
                     return promiseChain.then(() => new Promise((resolve, reject) => {
-                        transaction.query(currentQuery, params[index], (err, result) => {
-                            if (err)
+                        var _a;
+                        transaction.query(currentQuery, (_a = params[index]) !== null && _a !== void 0 ? _a : [], (err, result) => {
+                            if (err) {
                                 return reject(err);
-                            else
-                                return resolve(result);
+                            }
+                            return resolve(result);
                         });
                     }));
                 }, Promise.resolve());
             }
             catch (error) {
-                return yield new Promise((resolve, reject) => {
+                return yield new Promise((_resolve, reject) => {
                     transaction.rollback((rollbackErr) => {
                         if (rollbackErr) {
                             return reject(rollbackErr);
                         }
-                        else {
-                            return reject(error);
-                        }
+                        return reject(error);
                     });
                 });
             }
@@ -397,5 +438,5 @@ class Orm {
 }
 exports.Orm = Orm;
 Orm.logger = new Logger_1.Logger(Orm.name);
-Orm.compatibilityProfileCache = new Map();
+Orm.pools = new Map();
 //# sourceMappingURL=Orm.js.map