logixia 1.13.0 → 1.13.3

package/dist/{transport.manager-BivyUTtU.js → transport.manager-Crau3Rle.js}

@@ -1,7 +1,8 @@
 const require_chunk = require('./chunk-nOFOJqeH.js');
 const require_internal_log = require('./internal-log-BUJYMZbE.js');
 const require_safe_stringify = require('./safe-stringify-DWo3aZp_.js');
-const require_coerce_utils = require('./coerce.utils-BN980Y9V.js');
+const require_entry_fields = require('./entry-fields-BvOLFlJ4.js');
+const require_coerce_utils = require('./coerce.utils-B-LilukN.js');
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_path = require("node:path");
@@ -15,6 +16,24 @@ node_util = require_chunk.__toESM(node_util);
 let node_zlib = require("node:zlib");
 node_zlib = require_chunk.__toESM(node_zlib);
 
+//#region src/utils/sanitize.utils.ts
+/**
+* Control-character stripping for text-mode log output.
+*
+* Line breaks become the visible escapes `\\n` / `\\r`; other C0 characters
+* (except tab), DEL and C1 characters are removed, so user-supplied text cannot
+* inject ANSI escapes, overwrite lines, or forge extra log entries.
+*/
+const CONTROL_CHARS_RE = /[\x00-\x08\x0A-\x1F\x7F-\x9F]/g;
+const VISIBLE_ESCAPES = {
+	"\n": "\\n",
+	"\r": "\\r"
+};
+function stripControlChars(value) {
+	return value.replace(CONTROL_CHARS_RE, (ch) => VISIBLE_ESCAPES[ch] ?? "");
+}
+
+//#endregion
 //#region src/transports/console.transport.ts
 /**
 * Writes log entries to stdout (info/debug/verbose) and stderr (error/warn).
@@ -45,9 +64,8 @@ var ConsoleTransport = class ConsoleTransport {
 		["brightwhite", "\x1B[97m"],
 		["reset", "\x1B[0m"]
 	]);
-	static #_2 = this.CONTROL_CHARS_RE = /[\x00-\x08\x0B-\x1F\x7F-\x9F]/g;
 	static sanitize(value) {
-		return require_coerce_utils.safeToString(value).replace(ConsoleTransport.CONTROL_CHARS_RE, "");
+		return stripControlChars(require_coerce_utils.safeToString(value));
 	}
 	constructor(config = {}) {
 		this.config = config;
@@ -60,16 +78,15 @@ var ConsoleTransport = class ConsoleTransport {
 		(lvl === "error" || lvl === "warn" ? process.stderr : process.stdout).write(formatted);
 	}
 	formatEntry(entry) {
-		if (this.config.format === "json") return require_safe_stringify.stringifyForLog({
+		if (this.config.format === "json") return require_safe_stringify.stringifyForLog(require_entry_fields.mergeCoreFields({
 			timestamp: this.config.timestamp !== false ? entry.timestamp.toISOString() : void 0,
 			level: entry.level,
 			message: entry.message,
-			...entry.data || {},
 			context: entry.context,
 			traceId: entry.traceId,
 			appName: entry.appName,
 			environment: entry.environment
-		});
+		}, entry.data));
 		const parts = [];
 		if (this.config.timestamp !== false) {
 			const timestamp = entry.timestamp.toISOString();
@@ -117,6 +134,47 @@ var ConsoleTransport = class ConsoleTransport {
 	}
 };
 
+//#endregion
+//#region src/transports/buffer-cap.ts
+const DEFAULT_BUFFER_CAP = 1e4;
+const DROP_WARN_INTERVAL_MS$1 = 5e3;
+/**
+* Keeps an in-memory retry buffer bounded. Past `max` the oldest items are
+* dropped, counted, and reported through internalWarn at most every few seconds.
+*
+* `requested` must be an integer of at least 1, otherwise the default is used.
+* A cap below `batchSize` is raised to `batchSize` so one batch always fits.
+*/
+var BufferCap = class {
+	constructor(name, requested, batchSize, fallback = DEFAULT_BUFFER_CAP) {
+		this.name = name;
+		this.dropped = 0;
+		this.lastWarning = 0;
+		let max = fallback;
+		if (requested !== void 0) if (Number.isInteger(requested) && requested >= 1) max = requested;
+		else require_internal_log.internalWarn(`${name}: maxBufferSize ${String(requested)} is not a positive integer; using ${fallback}`);
+		this.max = Math.max(max, batchSize);
+	}
+	/** Drops the oldest items beyond the cap, in place. */
+	enforce(items) {
+		const excess = items.length - this.max;
+		if (excess <= 0) return;
+		items.splice(0, excess);
+		this.note(excess);
+	}
+	note(count) {
+		this.dropped += count;
+		this.report(DROP_WARN_INTERVAL_MS$1);
+	}
+	report(minGapMs) {
+		const now = Date.now();
+		if (this.dropped === 0 || now - this.lastWarning < minGapMs) return;
+		require_internal_log.internalWarn(`${this.name}: buffer full (${this.max}), dropped ${this.dropped} oldest entr${this.dropped === 1 ? "y" : "ies"}`);
+		this.dropped = 0;
+		this.lastWarning = now;
+	}
+};
+
 //#endregion
 //#region src/transports/database.transport.ts
 /**
@@ -127,6 +185,80 @@ const POSTGRES_MAX_PARAMS = 65535;
 const POSTGRES_COLUMNS = 8;
 const POSTGRES_ROWS_PER_INSERT = Math.floor(POSTGRES_MAX_PARAMS / POSTGRES_COLUMNS);
 const MYSQL_ROWS_PER_INSERT = 5e3;
+/** Postgres rejects NUL in TEXT and JSONB. */
+function stripNul(value) {
+	return typeof value === "string" ? value.split("\0").join("") : value;
+}
+/** JSONB also rejects the \u0000 escape, which JSON.stringify writes for a NUL. */
+function stripJsonNulEscape(value) {
+	if (typeof value !== "string") return value;
+	return value.replace(/(?<!\\)((?:\\\\)*)\\u0000/g, "$1");
+}
+const PG_DATA_CLASSES = [
+	"22",
+	"23",
+	"54"
+];
+const MYSQL_DATA_CODES = new Set([
+	"ER_DATA_TOO_LONG",
+	"ER_TRUNCATED_WRONG_VALUE",
+	"ER_TRUNCATED_WRONG_VALUE_FOR_FIELD",
+	"ER_BAD_NULL_ERROR",
+	"ER_WARN_DATA_OUT_OF_RANGE",
+	"ER_DUP_ENTRY",
+	"ER_INVALID_JSON_TEXT",
+	"ER_INVALID_CHARACTER_STRING"
+]);
+const MYSQL_DATA_ERRNOS = new Set([
+	1048,
+	1062,
+	1264,
+	1292,
+	1366,
+	1406,
+	3140
+]);
+const SQLITE_DATA_CODES = new Set([
+	"SQLITE_CONSTRAINT",
+	"SQLITE_TOOBIG",
+	"SQLITE_MISMATCH"
+]);
+const MONGO_DATA_CODES = new Set([
+	2,
+	121,
+	10334,
+	11e3
+]);
+function isDataErrorLayer(type, e) {
+	const code = e.code;
+	switch (type) {
+		case "postgresql": return typeof code === "string" && PG_DATA_CLASSES.includes(code.slice(0, 2));
+		case "mysql": return typeof code === "string" && MYSQL_DATA_CODES.has(code) || typeof e.errno === "number" && MYSQL_DATA_ERRNOS.has(e.errno);
+		case "sqlite": return typeof code === "string" && (SQLITE_DATA_CODES.has(code) || code.startsWith("SQLITE_CONSTRAINT_"));
+		case "mongodb": return e.name === "BSONObjectTooLarge" || typeof code === "number" && MONGO_DATA_CODES.has(code);
+		default: return false;
+	}
+}
+/**
+* True when the database refused the data itself (bad value, constraint, size),
+* which retrying cannot fix. Connection, timeout, auth and unknown errors are
+* not data errors and must be retried, never dropped.
+*/
+function isDataError(type, error) {
+	let current = error;
+	for (let depth = 0; depth < 3 && current && typeof current === "object"; depth += 1) {
+		if (isDataErrorLayer(type, current)) return true;
+		current = current.cause;
+	}
+	return false;
+}
+/** A write that stored part of a batch: only `remaining` still needs to be written. */
+var PartialWriteError = class extends Error {
+	constructor(message, remaining, cause) {
+		super(message, { cause });
+		this.remaining = remaining;
+	}
+};
 function chunk(items, size) {
 	const chunks = [];
 	for (let i = 0; i < items.length; i += size) chunks.push(items.slice(i, i + size));
@@ -155,6 +287,7 @@ var DatabaseTransport = class {
 		this.isConnected = false;
 		this.batchSize = config.batchSize || 100;
 		this.flushInterval = config.flushInterval || 5e3;
+		this.cap = new BufferCap("DatabaseTransport", config.maxBufferSize, this.batchSize);
 		if (config.filter) this.filter = config.filter;
 		if (config.table) validateSqlIdentifier(config.table, "table");
 		this.setupFlushTimer();
@@ -166,6 +299,7 @@ var DatabaseTransport = class {
 	}
 	addToBatch(entry) {
 		this.batch.push(entry);
+		this.cap.enforce(this.batch);
 	}
 	async flush() {
 		if (!this.flushPromise) this.flushPromise = this.drain().finally(() => {
@@ -174,37 +308,97 @@ var DatabaseTransport = class {
 		await this.flushPromise;
 	}
 	/**
-	* Drains the batch to the database one snapshot at a time. The current batch
-	* is detached SYNCHRONOUSLY before awaiting the write, so entries appended by
-	* concurrent write() calls land in a fresh array and are never written twice.
-	* On write failure the snapshot is restored to the front of the batch for the
-	* next flush cycle and the loop stops, so a persistently failing DB does not
-	* hot-spin retrying the same entries.
+	* Drains the buffer to the database one batch at a time. A batch is detached
+	* SYNCHRONOUSLY before awaiting the write, so entries appended by concurrent
+	* write() calls land in a fresh array and are never written twice.
+	*
+	* A failure that is not a data error (connection, timeout, auth, unknown) puts
+	* the batch back at the front of the buffer, bounded by `maxBufferSize`, and
+	* stops the loop so a down database is not hammered. A data error means the
+	* database refused some entry itself, so that batch alone is split to find and
+	* drop the refused entries; see isolate().
 	*/
 	async drain() {
 		while (this.batch.length > 0) {
-			const entriesToFlush = this.batch;
-			this.batch = [];
+			const entries = this.batch.splice(0, this.batchSize);
 			try {
-				switch (this.config.type) {
-					case "mongodb":
-						await this.flushToMongoDB(entriesToFlush);
-						break;
-					case "postgresql":
-						await this.flushToPostgreSQL(entriesToFlush);
-						break;
-					case "mysql":
-						await this.flushToMySQL(entriesToFlush);
-						break;
-					case "sqlite":
-						await this.flushToSQLite(entriesToFlush);
-						break;
-					default: throw new Error(`Unsupported database type: ${this.config.type}`);
-				}
+				await this.writeEntries(entries);
 			} catch (error) {
 				require_internal_log.internalError("Database flush error", error);
-				this.batch.unshift(...entriesToFlush);
-				throw error;
+				if (error instanceof PartialWriteError) {
+					this.requeue(error.remaining);
+					throw error.cause;
+				}
+				if (!isDataError(this.config.type, error)) {
+					this.requeue(entries);
+					throw error;
+				}
+				const state = {
+					budget: 2 * this.batchSize,
+					rejected: 0,
+					requeue: [],
+					stopped: false
+				};
+				await this.isolate(entries, state);
+				if (state.rejected > 0) require_internal_log.internalWarn(`DatabaseTransport: dropped ${state.rejected} log entr${state.rejected === 1 ? "y" : "ies"} the database rejected`);
+				this.requeue(state.requeue);
+				if (state.stopped) throw state.error;
+			}
+		}
+	}
+	requeue(entries) {
+		if (entries.length === 0) return;
+		this.batch = entries.concat(this.batch);
+		this.cap.enforce(this.batch);
+	}
+	async writeEntries(entries) {
+		switch (this.config.type) {
+			case "mongodb":
+				await this.flushToMongoDB(entries);
+				break;
+			case "postgresql":
+				await this.flushToPostgreSQL(entries);
+				break;
+			case "mysql":
+				await this.flushToMySQL(entries);
+				break;
+			case "sqlite":
+				await this.flushToSQLite(entries);
+				break;
+			default: throw new Error(`Unsupported database type: ${this.config.type}`);
+		}
+	}
+	/**
+	* `entries` failed with a data error. Splits them in half until the refused
+	* entries are alone and drops those. A write that fails with anything but a
+	* data error, or running out of the per-flush write budget, stops the search:
+	* the entries not yet written go back to the buffer.
+	*/
+	async isolate(entries, state) {
+		if (entries.length === 1) {
+			state.rejected += 1;
+			return;
+		}
+		const mid = Math.ceil(entries.length / 2);
+		for (const half of [entries.slice(0, mid), entries.slice(mid)]) {
+			if (state.stopped || state.budget <= 0) {
+				state.requeue.push(...half);
+				continue;
+			}
+			state.budget -= 1;
+			try {
+				await this.writeEntries(half);
+			} catch (error) {
+				if (error instanceof PartialWriteError) {
+					state.requeue.push(...error.remaining);
+					state.stopped = true;
+					state.error = error.cause;
+				} else if (isDataError(this.config.type, error)) await this.isolate(half, state);
+				else {
+					state.requeue.push(...half);
+					state.stopped = true;
+					state.error = error;
+				}
 			}
 		}
 	}
@@ -329,7 +523,26 @@ var DatabaseTransport = class {
 			appName: entry.appName,
 			environment: entry.environment
 		}));
-		await collection.insertMany(documents);
+		try {
+			await collection.insertMany(documents, { ordered: false });
+		} catch (error) {
+			const raw = error.writeErrors;
+			let list = [];
+			if (Array.isArray(raw)) list = raw;
+			else if (raw) list = [raw];
+			const writeErrors = list;
+			if (writeErrors.length === 0) throw error;
+			const remaining = [];
+			let rejected = 0;
+			for (const writeError of writeErrors) {
+				const entry = typeof writeError.index === "number" ? entries[writeError.index] : void 0;
+				if (!entry) throw error;
+				if (isDataError("mongodb", writeError)) rejected += 1;
+				else remaining.push(entry);
+			}
+			if (rejected > 0) require_internal_log.internalWarn(`DatabaseTransport: dropped ${rejected} log entr${rejected === 1 ? "y" : "ies"} the database rejected`);
+			if (remaining.length > 0) throw new PartialWriteError("MongoDB insert partially failed", remaining, error);
+		}
 	}
 	async flushToPostgreSQL(entries) {
 		const tableName = this.config.table || "logs";
@@ -342,7 +555,7 @@ var DatabaseTransport = class {
 			entry.traceId,
 			entry.appName,
 			entry.environment
-		]), POSTGRES_ROWS_PER_INSERT);
+		].map((value, column) => stripNul(column === 3 ? stripJsonNulEscape(value) : value))), POSTGRES_ROWS_PER_INSERT);
 		const insertChunk = async (rows) => {
 			const query = `
       INSERT INTO ${tableName} 
@@ -502,6 +715,7 @@ var DatabaseTransport = class {
 			require_internal_log.internalError("Database flush during close failed; entries remain buffered", error);
 		}
 		if (this.batch.length > 0) require_internal_log.internalError(`Database transport closing with ${this.batch.length} unflushed log entr${this.batch.length === 1 ? "y" : "ies"} after ${MAX_CLOSE_FLUSH_ATTEMPTS} attempts`);
+		this.cap.report(0);
 		if (this.connection) switch (this.config.type) {
 			case "mongodb":
 				await this.connection.close();
@@ -573,6 +787,7 @@ var AnalyticsTransport = class {
 		this.level = config.level;
 		this.batchSize = this.config.batchSize || 50;
 		this.flushInterval = this.config.flushInterval || 1e4;
+		this.cap = new BufferCap(name, config.maxBufferSize, this.batchSize);
 	}
 	async write(entry) {
 		if (!this.isReady) await this.ensureReady();
@@ -582,6 +797,7 @@ var AnalyticsTransport = class {
 	}
 	addToBatch(entry) {
 		this.batch.push(entry);
+		this.cap.enforce(this.batch);
 		if (this.batch.length >= (this.config.batchSize || 50)) this.flush().catch((err) => require_internal_log.internalError(`${this.name} batch flush failed`, err));
 		else if (!this.batchTimer && this.config.flushInterval) {
 			var _this$batchTimer$unre, _this$batchTimer;
@@ -617,6 +833,7 @@ var AnalyticsTransport = class {
 			} catch (error) {
 				require_internal_log.internalError(`Analytics transport ${this.name} flush failed`, error);
 				this.batch.unshift(...entriesToSend);
+				this.cap.enforce(this.batch);
 				return;
 			}
 		}
@@ -629,25 +846,36 @@ var AnalyticsTransport = class {
 		const MAX_CLOSE_FLUSH_ATTEMPTS = 3;
 		for (let attempt = 0; attempt < MAX_CLOSE_FLUSH_ATTEMPTS && this.batch.length > 0; attempt += 1) await this.flush();
 		if (this.batch.length > 0) require_internal_log.internalError(`Analytics transport ${this.name} closing with ${this.batch.length} unflushed entr${this.batch.length === 1 ? "y" : "ies"} after ${MAX_CLOSE_FLUSH_ATTEMPTS} attempts`);
+		this.cap.report(0);
 		await this.cleanup();
 	}
 	shouldSkipEntry(entry) {
 		return ["debug", "trace"].includes(entry.level.toLowerCase());
 	}
 	transformEntry(entry) {
-		const transformed = {
+		const core = {
 			timestamp: entry.timestamp.toISOString(),
 			level: entry.level,
 			message: entry.message,
-			...entry.data
+			context: entry.context,
+			traceId: entry.traceId,
+			appName: entry.appName,
+			environment: entry.environment
 		};
-		if (entry.context) transformed.context = entry.context;
-		if (entry.traceId) transformed.traceId = entry.traceId;
-		if (entry.appName) transformed.appName = entry.appName;
-		if (entry.environment) transformed.environment = entry.environment;
+		const transformed = require_entry_fields.mergeCoreFields(core, entry.data, this.reservedKeys());
+		for (const key of [
+			"context",
+			"traceId",
+			"appName",
+			"environment"
+		]) if (!core[key]) delete transformed[key];
 		if (this.config.customProperties) Object.assign(transformed, this.config.customProperties);
 		return transformed;
 	}
+	/** Provider-specific field names a payload key must not replace. */
+	reservedKeys() {
+		return [];
+	}
 	/**
 	* Runs initialize() once. A bad config (say, a missing API key) fails every
 	* write with the same error instead of an unhandled rejection at startup.
@@ -732,8 +960,12 @@ var DataDogTransport = class extends AnalyticsTransport {
 		await this.sendLogBatch(entries);
 	}
 	transformToDataDogLog(entry) {
-		const transformed = this.transformEntry(entry);
 		return {
+			...this.transformEntry(entry),
+			"dd.trace_id": entry.traceId,
+			"dd.span_id": this.generateSpanId(),
+			host: this.getHostname(),
+			source: "nodejs",
 			timestamp: entry.timestamp.toISOString(),
 			level: this.mapLogLevel(entry.level),
 			message: entry.message,
@@ -743,14 +975,25 @@ var DataDogTransport = class extends AnalyticsTransport {
 			logger: {
 				name: "logixia",
 				thread_name: "main"
-			},
-			...transformed,
-			"dd.trace_id": entry.traceId,
-			"dd.span_id": this.generateSpanId(),
-			host: this.getHostname(),
-			source: "nodejs"
+			}
 		};
 	}
+	reservedKeys() {
+		return [
+			"status",
+			"ddtags",
+			"ddsource",
+			"hostname",
+			"service",
+			"version",
+			"env",
+			"logger",
+			"host",
+			"source",
+			"dd.trace_id",
+			"dd.span_id"
+		];
+	}
 	transformToDataDogMetric(entry) {
 		return {
 			metric: `logitron.logs.${entry.level}`,
@@ -890,6 +1133,12 @@ const unlink = (0, node_util.promisify)(node_fs.unlink);
 const readdir = (0, node_util.promisify)(node_fs.readdir);
 const stat = (0, node_util.promisify)(node_fs.stat);
 const DROP_WARN_INTERVAL_MS = 5e3;
+const DEFAULT_MAX_QUEUE = 1e4;
+const DEFAULT_FILE_MODE = 384;
+const DEFAULT_DIR_MODE = 448;
+function csvField(value) {
+	return `"${stripControlChars(require_coerce_utils.safeToString(value)).replace(/"/g, "\"\"")}"`;
+}
 const SIZE_UNITS = {
 	"": 1,
 	k: 1024,
@@ -925,6 +1174,10 @@ function formatDatePattern(date, pattern) {
 * rotated files are renamed beside it (`app-2026-10-22T09-30-00-000.log`).
 * With a `rotation` block every file, the live one included, is timestamped.
 *
+* Files are created with mode 0o600 and directories with 0o700; override with
+* `fileMode` and `dirMode`. At most `maxQueue` (default 10000) entries wait in
+* memory; the rest are dropped per `queuePolicy` and counted in a warning.
+*
 * @example
 * transports: { file: { filename: 'app.log', dirname: './logs', maxSize: '50MB' } }
 */
@@ -959,8 +1212,10 @@ var FileTransport = class {
 		this.maxBytes = parseSize(rawMaxSize);
 		if (rawMaxSize !== void 0 && this.maxBytes === void 0) require_internal_log.internalWarn(`FileTransport: maxSize ${JSON.stringify(rawMaxSize)} is not a valid size (try '50MB'); size rotation is off`);
 		const maxQueue = config.maxQueue;
-		if (maxQueue !== void 0 && !(Number.isInteger(maxQueue) && maxQueue > 0)) require_internal_log.internalWarn(`FileTransport: maxQueue ${String(maxQueue)} is not a positive integer; ignored`);
-		else this.maxQueue = maxQueue;
+		if (maxQueue !== void 0 && !(Number.isInteger(maxQueue) && maxQueue > 0)) require_internal_log.internalWarn(`FileTransport: maxQueue ${String(maxQueue)} is not a positive integer; using ${DEFAULT_MAX_QUEUE}`);
+		this.maxQueue = maxQueue !== void 0 && Number.isInteger(maxQueue) && maxQueue > 0 ? maxQueue : DEFAULT_MAX_QUEUE;
+		this.fileMode = config.fileMode ?? DEFAULT_FILE_MODE;
+		this.dirMode = config.dirMode ?? DEFAULT_DIR_MODE;
 		this.queuePolicy = config.queuePolicy ?? "drop-oldest";
 		this.maxFiles = (rotation === null || rotation === void 0 ? void 0 : rotation.maxFiles) ?? config.maxFiles;
 		this.compress = (rotation === null || rotation === void 0 ? void 0 : rotation.compress) ?? config.zippedArchive ?? false;
@@ -970,7 +1225,10 @@ var FileTransport = class {
 		this.ext = node_path.extname(config.filename);
 		this.base = node_path.basename(config.filename, this.ext);
 		try {
-			node_fs.mkdirSync(this.dir, { recursive: true });
+			node_fs.mkdirSync(this.dir, {
+				recursive: true,
+				mode: this.dirMode
+			});
 		} catch (error) {
 			require_internal_log.internalError(`FileTransport could not create ${this.dir}`, error);
 		}
@@ -1038,7 +1296,7 @@ var FileTransport = class {
 		this.enqueued += 1;
 	}
 	queueFull() {
-		return this.maxQueue !== void 0 && this.batch.length + this.inFlight >= this.maxQueue;
+		return this.batch.length + this.inFlight >= this.maxQueue;
 	}
 	roomAvailable() {
 		const room = new Promise((resolve) => this.spaceWaiters.push(resolve));
@@ -1118,30 +1376,26 @@ var FileTransport = class {
 	}
 	formatEntry(entry) {
 		switch (this.config.format) {
-			case "json": return require_safe_stringify.stringifyForLog({
+			case "json": return require_safe_stringify.stringifyForLog(require_entry_fields.mergeCoreFields({
 				timestamp: entry.timestamp.toISOString(),
 				level: entry.level,
-				message: entry.message,
-				...entry.data || {}
-			});
-			case "csv": {
-				const safeMessage = require_coerce_utils.safeToString(entry.message);
-				return [
-					entry.timestamp.toISOString(),
-					entry.level,
-					`"${safeMessage.replace(/"/g, "\"\"")}"`,
-					require_coerce_utils.safeToString(entry.context),
-					require_coerce_utils.safeToString(entry.traceId),
-					require_safe_stringify.stringifyForLog(entry.data || {})
-				].join(",");
-			}
+				message: entry.message
+			}, entry.data));
+			case "csv": return [
+				entry.timestamp.toISOString(),
+				csvField(entry.level),
+				csvField(entry.message),
+				csvField(entry.context),
+				csvField(entry.traceId),
+				csvField(require_safe_stringify.stringifyForLog(entry.data || {}))
+			].join(",");
 			case "text":
-			default: return `${entry.timestamp.toISOString()} [${entry.level.toUpperCase()}] ${require_coerce_utils.safeToString(entry.message)}${entry.data ? " " + require_safe_stringify.stringifyForLog(entry.data) : ""}`;
+			default: return `${entry.timestamp.toISOString()} [${stripControlChars(require_coerce_utils.safeToString(entry.level)).toUpperCase()}] ${stripControlChars(require_coerce_utils.safeToString(entry.message))}${entry.data ? " " + require_safe_stringify.stringifyForLog(entry.data) : ""}`;
 		}
 	}
 	addToBatch(entry) {
 		this.enqueue(entry);
-		const threshold = Math.min(this.config.batchSize || 100, this.maxQueue ?? Infinity);
+		const threshold = Math.min(this.config.batchSize || 100, this.maxQueue);
 		if (this.batch.length >= threshold && !this.draining) {
 			if (this.batchTimer) {
 				clearTimeout(this.batchTimer);
@@ -1179,7 +1433,7 @@ var FileTransport = class {
 		if (chunk$1) await this.append(chunk$1, chunkBytes);
 	}
 	async append(content, bytes = Buffer.byteLength(content)) {
-		await appendFile(this.currentFilePath, content);
+		await appendFile(this.currentFilePath, content, { mode: this.fileMode });
 		this.bytesWritten += bytes;
 	}
 	timeToRotate() {
@@ -1273,7 +1527,7 @@ var FileTransport = class {
 	async compressFile(filePath) {
 		const gzPath = `${filePath}.gz`;
 		try {
-			await (0, node_stream_promises.pipeline)(node_fs.createReadStream(filePath), (0, node_zlib.createGzip)(), node_fs.createWriteStream(gzPath));
+			await (0, node_stream_promises.pipeline)(node_fs.createReadStream(filePath), (0, node_zlib.createGzip)(), node_fs.createWriteStream(gzPath, { mode: this.fileMode }));
 			await unlink(filePath);
 		} catch (error) {
 			require_internal_log.internalError("Failed to compress rotated log file", error);
@@ -1357,12 +1611,27 @@ var GoogleAnalyticsTransport = class extends AnalyticsTransport {
 		await this.sendEvents(events);
 	}
 	async cleanup() {}
+	reservedKeys() {
+		return [
+			"event_category",
+			"event_label",
+			"log_level",
+			"log_message",
+			"trace_id",
+			"app_name",
+			"custom_dimension_1",
+			"custom_dimension_2",
+			"custom_dimension_3"
+		];
+	}
 	transformToGAEvent(entry) {
 		const transformed = this.transformEntry(entry);
+		const eventCategory = this.mapLogLevelToCategory(entry.level);
 		return {
 			name: "log_event",
 			params: {
-				event_category: this.mapLogLevelToCategory(entry.level),
+				...this.flattenData(transformed),
+				event_category: eventCategory,
 				event_label: entry.message,
 				log_level: entry.level,
 				log_message: entry.message,
@@ -1371,7 +1640,6 @@ var GoogleAnalyticsTransport = class extends AnalyticsTransport {
 				...entry.traceId && { trace_id: entry.traceId },
 				...entry.appName && { app_name: entry.appName },
 				...entry.environment && { environment: entry.environment },
-				...this.flattenData(transformed),
 				custom_dimension_1: entry.level,
 				custom_dimension_2: entry.context || "default",
 				custom_dimension_3: entry.environment || "production"
@@ -1567,12 +1835,21 @@ var MixpanelTransport = class extends AnalyticsTransport {
 		await this.trackEvents(events);
 	}
 	async cleanup() {}
+	reservedKeys() {
+		return [
+			"token",
+			"distinct_id",
+			"time",
+			"$insert_id"
+		];
+	}
 	transformToMixpanelEvent(entry) {
 		const transformed = this.transformEntry(entry);
 		return {
 			name: `log_${entry.level}`,
 			properties: {
 				...transformed,
+				token: this.mixpanelConfig.token,
 				distinct_id: this.mixpanelConfig.distinct_id || "anonymous",
 				time: entry.timestamp.getTime(),
 				$insert_id: this.generateInsertId(entry),
@@ -1585,8 +1862,8 @@ var MixpanelTransport = class extends AnalyticsTransport {
 		const payload = {
 			event: event.name,
 			properties: {
-				token: this.mixpanelConfig.token,
-				...event.properties
+				...event.properties,
+				token: this.mixpanelConfig.token
 			}
 		};
 		await this.makeRequest("/track", [payload]);
@@ -1595,8 +1872,8 @@ var MixpanelTransport = class extends AnalyticsTransport {
 		const payload = events.map((event) => ({
 			event: event.name,
 			properties: {
-				token: this.mixpanelConfig.token,
-				...event.properties
+				...event.properties,
+				token: this.mixpanelConfig.token
 			}
 		}));
 		await this.makeRequest("/track", payload);
@@ -1654,11 +1931,11 @@ var MixpanelTransport = class extends AnalyticsTransport {
 		const payload = {
 			event: eventName,
 			properties: {
+				...properties,
+				...this.mixpanelConfig.enableSuperProperties ? this.mixpanelConfig.superProperties : {},
 				token: this.mixpanelConfig.token,
 				distinct_id: this.mixpanelConfig.distinct_id || "anonymous",
-				time: Date.now(),
-				...properties,
-				...this.mixpanelConfig.enableSuperProperties ? this.mixpanelConfig.superProperties : {}
+				time: Date.now()
 			}
 		};
 		await this.makeRequest("/track", [payload]);
@@ -1718,6 +1995,9 @@ var SegmentTransport = class extends AnalyticsTransport {
 		await this.batchTrack(segmentEvents);
 	}
 	async cleanup() {}
+	reservedKeys() {
+		return ["logger"];
+	}
 	transformToSegmentEvent(entry) {
 		const transformed = this.transformEntry(entry);
 		return {
@@ -1727,10 +2007,10 @@ var SegmentTransport = class extends AnalyticsTransport {
 			anonymousId: this.generateAnonymousId(),
 			timestamp: entry.timestamp.toISOString(),
 			properties: {
+				...transformed,
 				level: entry.level,
 				message: entry.message,
 				logger: "logixia",
-				...transformed,
 				...entry.context && { context: entry.context },
 				...entry.traceId && { traceId: entry.traceId },
 				...entry.appName && { appName: entry.appName },
@@ -1786,11 +2066,10 @@ var SegmentTransport = class extends AnalyticsTransport {
 		}
 	}
 	extractUserId(entry) {
-		if (entry.data) {
-			const d = entry.data;
-			const id = d["userId"] ?? d["user_id"] ?? d["id"];
-			return typeof id === "string" ? id : void 0;
-		}
+		var _entry$data;
+		const field = this.segmentConfig.userIdField ?? "userId";
+		const id = (_entry$data = entry.data) === null || _entry$data === void 0 ? void 0 : _entry$data[field];
+		return typeof id === "string" ? id : void 0;
 	}
 	generateAnonymousId() {
 		return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
@@ -2345,4 +2624,10 @@ Object.defineProperty(exports, 'TransportManager', {
     return TransportManager;
   }
 });
-//# sourceMappingURL=transport.manager-BivyUTtU.js.map
+Object.defineProperty(exports, 'stripControlChars', {
+  enumerable: true,
+  get: function () {
+    return stripControlChars;
+  }
+});
+//# sourceMappingURL=transport.manager-Crau3Rle.js.map