@spinajs/log 2.0.480 → 2.0.482

package/lib/cjs/targets/ColoredConsoleTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAI6B;AAC7B,oCAAoD;AACpD,4CAAyC;AACzC,kDAA0B;AAC1B,0DAAgD;AAEnC,QAAA,aAAa,GAAG;IAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,WAAW;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAC;AAIK,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAuC;IAA1E;;QACK,UAAK,GAAU,EAAE,CAAC;QAElB,0BAAqB,GAAG;YAChC,CAAC,mBAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,mBAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,mBAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK;YAElC,CAAC,mBAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG;YAC5B,CAAC,mBAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG;YAE/B,CAAC,mBAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,mBAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAE/B,CAAC,mBAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;SAC9B,CAAC;IA8BJ,CAAC;IA5BQ,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,OAAO,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,mBAAQ,CAAC,QAAQ,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QAEnD,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAe;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC;QACpC;;WAEG;QACH,oBAAoB;QACnB,IAAI,CAAC,KAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAC7B,IAAA,sBAAM,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAC5C,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AA7CY,oDAAoB;+BAApB,oBAAoB;IAFhC,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,eAAe,CAAC;GACf,oBAAoB,CA6ChC"}
+{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":"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"}

package/lib/cjs/targets/FileTarget.d.ts

@@ -1,28 +1,104 @@
-import fs from "fs";
 import { IInstanceCheck } from "@spinajs/di";
-import { IFileTargetOptions, Log, ILogEntry, LogTarget } from "@spinajs/log-common";
-declare enum FileTargetStatus {
-    WRITTING = 0,
-    PENDING = 1,
-    IDLE = 2
-}
+import { fs } from "@spinajs/fs";
+import { IFileTargetOptions, Log, ILogEntry, LogTarget, BatchQueue } from "@spinajs/log-common";
+import { LogArchiveService } from "../archive/LogArchiveService.js";
+import { ILogArchiveContext } from "../archive/context.js";
+/**
+ * Writes log messages to a file through the @spinajs/fs abstraction.
+ *
+ * Messages are buffered in memory and flushed as a single batched append,
+ * either when the buffer reaches `maxBufferSize` or on a periodic flush tick.
+ * Rotation / archiving / retention is delegated to {@link LogArchiveService}.
+ *
+ * A single async write-lock ( a promise-chain mutex ) serializes every flush
+ * and every rotation, so a rename can never race an in-flight append.
+ *
+ * PerInstanceCheck: multiple file targets can point at different files, but two
+ * targets with the same name share one writer.
+ */
 export declare class FileTarget extends LogTarget<IFileTargetOptions> implements IInstanceCheck {
     protected Log: Log;
-    LogDirPath: string;
-    ArchiveDirPath: string;
-    protected WriteStream: fs.WriteStream;
-    protected Buffer: string[];
-    protected WriteBuffer: string[];
-    protected ArchiveTimer: NodeJS.Timeout;
-    protected FlushTimer: NodeJS.Timeout;
-    protected Status: FileTargetStatus;
-    protected ArchiveStatus: FileTargetStatus;
+    /**
+     * fs provider holding the active log file.
+     */
+    protected Fs: fs;
+    /**
+     * fs provider archives are moved to ( defaults to `Fs` ).
+     */
+    protected ArchiveFs: fs;
+    /**
+     * Directory ( relative to ArchiveFs ) archives are stored in.
+     */
+    protected ArchiveDir: string;
+    protected ArchiveService: LogArchiveService;
+    protected Context: ILogArchiveContext;
+    /**
+     * Buffered-batch queue owning accumulation, the flush tick and the hard queue
+     * cap. It delegates the actual batched append to {@link append} via onFlush.
+     */
+    protected Queue: BatchQueue<string>;
+    /**
+     * Set true when the queue drops overflow, so the drop warning is emitted ONCE
+     * per overflow episode and reset when a batch appends successfully.
+     */
+    protected Overflowed: boolean;
+    /**
+     * Async initialization ( fs resolution + mkdir + archive start ). write()
+     * and flush() await this so nothing touches the fs before it is ready.
+     */
+    protected Ready: Promise<void>;
+    /**
+     * Promise-chain mutex tail. Every critical section ( flush, rotation ) chains
+     * onto this so they run strictly one at a time.
+     */
+    protected WriteLock: Promise<unknown>;
+    protected Disposed: boolean;
     __checkInstance__(creationOptions: IFileTargetOptions[]): boolean;
     resolve(): void;
-    protected flush(): void;
-    dispose(): Promise<void>;
+    /**
+     * Resolves fs providers, ensures directories exist, builds the archive
+     * context and starts the archive service.
+     */
+    protected init(): Promise<void>;
     write(data: ILogEntry): Promise<void>;
-    protected archive(): void;
+    /**
+     * Builds the single line appended for one entry. Overridable so subclasses can
+     * change ONLY the per-entry serialization while reusing the whole FileTarget
+     * pipeline ( batched append, write-lock, rotation, retention, zip ). The base
+     * renders the configured string `layout`.
+     */
+    protected formatEntry(data: ILogEntry): string;
+    /**
+     * Flushes any buffered messages. Delegates to the queue's forceFlush so a
+     * caller ( eg. dispose or a test ) can await the drain.
+     */
+    protected flush(): Promise<void>;
+    forceFlush(): Promise<void>;
+    /**
+     * Appends one batch as a single write, guarded by the write-lock ( the SAME
+     * lock rotation uses, so a rename can never race an append ). On failure the
+     * batch is requeued at the FRONT so nothing is lost ( never-drop, bounded by
+     * maxQueue ). This ALWAYS resolves ( never rejects ) so queue.shutdown() -
+     * driven by dispose() - never rejects.
+     */
+    protected append(batch: string[]): Promise<void>;
+    dispose(): Promise<void>;
+    /**
+     * Runs `fn` under the shared write-lock. Flush and rotation both go through
+     * here, so a rename can never overlap an append.
+     */
+    protected withWriteLock<T>(fn: () => Promise<T>): Promise<T>;
+    /**
+     * Active log path relative to the fs provider base path. Recomputed each call
+     * so dynamic ( eg. date-based ) paths work.
+     */
+    protected activePath(): string;
+    /**
+     * Normalizes a configured path to forward slashes and strips a leading
+     * separator. Paths are interpreted relative to the fs provider base path -
+     * the provider itself sandboxes and resolves them, so we only canonicalize
+     * separators here.
+     */
+    protected normalize(p: string): string;
 }
-export {};
 //# sourceMappingURL=FileTarget.d.ts.map

package/lib/cjs/targets/FileTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAOpB,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAU,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAI5F,aAAK,gBAAgB;IACnB,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,UAAW,SAAQ,SAAS,CAAC,kBAAkB,CAAE,YAAW,cAAc;IAErF,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAE9B,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAChC,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC;IACvC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC;IAErC,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAyB;IAC3D,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAyB;IAElE,iBAAiB,CAAC,eAAe,EAAE,kBAAkB,EAAE,GAAG,OAAO;IAI1D,OAAO;IA+Dd,SAAS,CAAC,KAAK;IA0BF,OAAO;IAYP,KAAK,CAAC,IAAI,EAAE,SAAS;IA2BlC,SAAS,CAAC,OAAO;CAyGlB"}
+{"version":3,"file":"FileTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":"AAIA,OAAO,EAAM,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAU,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D;;;;;;;;;;;;GAYG;AACH,qBAEa,UAAW,SAAQ,SAAS,CAAC,kBAAkB,CAAE,YAAW,cAAc;IAErF,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC;IAEjB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,SAAM;IAE1B,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC;IAC5C,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAEtC;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAEpC;;;OAGG;IACH,SAAS,CAAC,UAAU,UAAS;IAE7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/B;;;OAGG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAqB;IAE1D,SAAS,CAAC,QAAQ,UAAS;IAE3B,iBAAiB,CAAC,eAAe,EAAE,kBAAkB,EAAE,GAAG,OAAO;IAI1D,OAAO,IAAI,IAAI;IA+CtB;;;OAGG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCxB,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAI9C;;;OAGG;cACa,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC;;;;;;OAMG;cACa,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASrC;;;OAGG;IACH,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAO5D;;;OAGG;IACH,SAAS,CAAC,UAAU,IAAI,MAAM;IAK9B;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;CAGvC"}

package/lib/cjs/targets/FileTarget.js

@@ -1,265 +1,228 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileTarget = void 0;
-/* eslint-disable security/detect-object-injection */
 const os_1 = require("os");
-const fs_1 = __importDefault(require("fs"));
-const path = __importStar(require("path"));
-const glob_1 = __importDefault(require("glob"));
-const zlib = __importStar(require("zlib"));
-const stream_1 = require("stream");
+const path_1 = require("path");
 const configuration_1 = require("@spinajs/configuration");
 const exceptions_1 = require("@spinajs/exceptions");
 const di_1 = require("@spinajs/di");
 const log_common_1 = require("@spinajs/log-common");
-const lodash_1 = __importDefault(require("lodash"));
-var FileTargetStatus;
-(function (FileTargetStatus) {
-    FileTargetStatus[FileTargetStatus["WRITTING"] = 0] = "WRITTING";
-    FileTargetStatus[FileTargetStatus["PENDING"] = 1] = "PENDING";
-    FileTargetStatus[FileTargetStatus["IDLE"] = 2] = "IDLE";
-})(FileTargetStatus || (FileTargetStatus = {}));
-// we mark per instance check becouse we can have multiple file targes
-// for different files/paths/logs but we dont want to create every time writer for same.
+const LogArchiveService_js_1 = require("../archive/LogArchiveService.js");
+const log_js_1 = require("../config/log.js");
+/**
+ * Writes log messages to a file through the @spinajs/fs abstraction.
+ *
+ * Messages are buffered in memory and flushed as a single batched append,
+ * either when the buffer reaches `maxBufferSize` or on a periodic flush tick.
+ * Rotation / archiving / retention is delegated to {@link LogArchiveService}.
+ *
+ * A single async write-lock ( a promise-chain mutex ) serializes every flush
+ * and every rotation, so a rename can never race an in-flight append.
+ *
+ * PerInstanceCheck: multiple file targets can point at different files, but two
+ * targets with the same name share one writer.
+ */
 let FileTarget = class FileTarget extends log_common_1.LogTarget {
     constructor() {
         super(...arguments);
-        this.Buffer = [];
-        this.WriteBuffer = [];
-        this.Status = FileTargetStatus.IDLE;
-        this.ArchiveStatus = FileTargetStatus.IDLE;
+        /**
+         * Directory ( relative to ArchiveFs ) archives are stored in.
+         */
+        this.ArchiveDir = "";
+        /**
+         * Set true when the queue drops overflow, so the drop warning is emitted ONCE
+         * per overflow episode and reset when a batch appends successfully.
+         */
+        this.Overflowed = false;
+        /**
+         * Promise-chain mutex tail. Every critical section ( flush, rotation ) chains
+         * onto this so they run strictly one at a time.
+         */
+        this.WriteLock = Promise.resolve();
+        this.Disposed = false;
     }
     __checkInstance__(creationOptions) {
         return this.Options.name === creationOptions[0].name;
     }
     resolve() {
-        this.Options.options = Object.assign({
-            compress: true,
-            maxSize: 1024 * 1024,
-            maxArchiveFiles: 5,
-            archiveInterval: 3 * 60,
-        }, this.Options.options);
-        this.LogDirPath = path.dirname(path.resolve((0, configuration_1.format)(null, this.Options.options.path)));
-        this.ArchiveDirPath = this.Options.options.archivePath ? path.resolve((0, configuration_1.format)(null, this.Options.options.archivePath)) : this.LogDirPath;
-        if (!this.LogDirPath) {
-            throw new exceptions_1.InvalidOption("Missing LogDirPath log option");
-        }
-        if (!fs_1.default.existsSync(this.LogDirPath)) {
-            fs_1.default.mkdirSync(this.LogDirPath, { recursive: true });
-        }
-        if (this.ArchiveDirPath) {
-            if (!fs_1.default.existsSync(this.ArchiveDirPath)) {
-                fs_1.default.mkdirSync(this.ArchiveDirPath, { recursive: true });
-            }
+        // Defaults come from the shipped `logger.file` config ( discoverable and
+        // user-overridable like every other spinajs package ). LOG_FILE_DEFAULTS is
+        // the same object the config ships and is used as a last-resort fallback for
+        // environments where the config file was not discovered ( eg. some tests ).
+        // Merge order ( lowest to highest ): constant < config < per-target options.
+        const cfg = di_1.DI.get(configuration_1.Configuration);
+        const fileDefaults = cfg ? cfg.get("logger.file", {}) : {};
+        this.Options.options = Object.assign({}, log_js_1.LOG_FILE_DEFAULTS, fileDefaults, this.Options.options);
+        if (!this.Options.options.path) {
+            throw new exceptions_1.InvalidOption(`FileTarget ${this.Options.name} requires a 'path' option`);
         }
-        // flush all buffered messages at least once per second
-        // we do this, becouse buffer can not be filled
-        // and we could wait unknown amount of time before messages are written to file
-        this.FlushTimer = setInterval(() => {
-            // do not flush, if we already writting to file
-            if (this.Status !== FileTargetStatus.IDLE && this.ArchiveStatus !== FileTargetStatus.IDLE) {
-                return;
-            }
-            this.WriteBuffer = [...this.WriteBuffer, ...this.Buffer];
-            this.Buffer = [];
-            setImmediate(() => {
-                this.flush();
-            });
-        }, 1000);
-        // every 3 minutes try to archive log files
-        this.ArchiveTimer = setInterval(() => {
-            // do not archive if we already doing it
-            if (this.Status !== FileTargetStatus.IDLE && this.ArchiveStatus !== FileTargetStatus.IDLE) {
-                return;
-            }
-            this.ArchiveStatus = FileTargetStatus.PENDING;
-            // at end of nodejs event loop
-            setImmediate(() => {
-                this.archive();
-            });
-        }, this.Options.options.archiveInterval * 1000);
+        // start async init - fs resolution and dir creation cannot run in a sync
+        // SyncService.resolve, so writes buffer until Ready settles
+        this.Ready = this.init();
+        this.Ready.catch((err) => {
+            this.HasError = true;
+            this.Error = err;
+            this.Log.error(err, `Cannot initialize file target ${this.Options.name}`);
+        });
+        // BatchQueue owns accumulation, the periodic flush tick ( unref'd, so a
+        // pending flush never keeps the process alive ) and the hard queue cap. The
+        // batched append itself runs in append() under the write-lock.
+        this.Queue = new log_common_1.BatchQueue({
+            maxBatch: this.Options.options.maxBufferSize,
+            maxQueue: this.Options.options.maxQueueSize,
+            flushIntervalMs: this.Options.options.flushInterval ?? log_js_1.LOG_FILE_DEFAULTS.flushInterval,
+            onFlush: (batch) => this.append(batch),
+            onOverflow: (droppedItems) => {
+                // droppedItems here are already-formatted STRINGS, so we cannot
+                // reconstruct the original ILogEntry to route via OnDropped. File
+                // overflow stays warn-only ( count from droppedItems.length ). The
+                // drop-hook ( D ) targets the network-primary -> file-fallback case,
+                // not File-as-primary drops.
+                if (!this.Overflowed) {
+                    this.Overflowed = true;
+                    this.Log.warn(`File target ${this.Options.name} buffer exceeded ${this.Options.options.maxQueueSize} messages, dropped ${droppedItems.length} oldest buffered messages.`);
+                }
+            },
+        });
         super.resolve();
     }
-    flush() {
-        if (this.WriteBuffer.length === 0) {
-            this.Status = FileTargetStatus.IDLE;
-            return;
+    /**
+     * Resolves fs providers, ensures directories exist, builds the archive
+     * context and starts the archive service.
+     */
+    async init() {
+        const o = this.Options.options;
+        // o.fs is always populated from LOG_FILE_DEFAULTS ( see resolve() )
+        this.Fs = di_1.DI.resolve("__file_provider__", [o.fs]);
+        this.ArchiveFs = o.archiveFs ? di_1.DI.resolve("__file_provider__", [o.archiveFs]) : this.Fs;
+        // path is relative to the fs provider base path; ensure its directory exists
+        const logDir = path_1.posix.dirname(this.activePath());
+        if (logDir && logDir !== ".") {
+            await this.Fs.mkdir(logDir);
         }
-        this.Status = FileTargetStatus.WRITTING;
-        // we calculate log path every time to allow for
-        // dynamic path creation eg. based on timestamp
-        const logFileName = (0, configuration_1.format)({ logger: this.Options.name }, path.basename(this.Options.options.path));
-        const logPath = path.join(this.LogDirPath, logFileName);
-        fs_1.default.appendFile(logPath, this.WriteBuffer.join(os_1.EOL) + os_1.EOL, (err) => {
-            // log error message to others if applicable eg. console
-            if (err) {
-                this.Log.error(err, `Cannot write log messages to file target at path ${logPath}`);
-            }
-            this.Log.trace(`Wrote buffered messages to log file at path ${logPath}, buffer size: ${this.Options.options.maxBufferSize}`);
-            this.WriteBuffer = [];
-            this.Status = FileTargetStatus.IDLE;
-        });
-    }
-    async dispose() {
-        // stop archiving
-        clearInterval(this.ArchiveTimer);
-        // stop flush timer
-        clearInterval(this.FlushTimer);
-        // write all messages from buffer
-        this.WriteBuffer = [...this.WriteBuffer, ...this.Buffer];
-        this.flush();
+        // archivePath ( when set ) is a directory relative to the archive fs; when
+        // not set, archives live in the same directory as the active log
+        this.ArchiveDir = o.archivePath ? this.normalize((0, configuration_1.format)(null, o.archivePath)) : logDir === "." ? "" : logDir;
+        if (this.ArchiveDir) {
+            await this.ArchiveFs.mkdir(this.ArchiveDir);
+        }
+        this.Context = {
+            fs: this.Fs,
+            archiveFs: this.ArchiveFs,
+            activePath: this.activePath(),
+            archiveDir: this.ArchiveDir,
+            options: o,
+            logger: this.Log,
+            rotate: () => this.ArchiveService.rotate(this.Context),
+            withWriteLock: (fn) => this.withWriteLock(fn),
+        };
+        this.ArchiveService = await di_1.DI.resolve(LogArchiveService_js_1.LogArchiveService);
+        await this.ArchiveService.start(this.Context);
     }
     async write(data) {
-        if (!this.Options.enabled) {
+        if (!this.Options.enabled || this.Disposed) {
             return;
         }
-        const lEntry = (0, configuration_1.format)(data.Variables, this.Options.layout);
-        this.Buffer.push(lEntry);
-        // if we already writting, skip buffer check & write to file
-        // wait until write is finished
-        if (this.Status !== FileTargetStatus.IDLE || this.ArchiveStatus !== FileTargetStatus.IDLE) {
+        const entry = this.formatEntry(data);
+        // enqueue awaits the batched append when maxBatch ( = maxBufferSize ) is
+        // reached, preserving the old "await flush when full" back-pressure
+        await this.Queue.enqueue(entry);
+    }
+    /**
+     * Builds the single line appended for one entry. Overridable so subclasses can
+     * change ONLY the per-entry serialization while reusing the whole FileTarget
+     * pipeline ( batched append, write-lock, rotation, retention, zip ). The base
+     * renders the configured string `layout`.
+     */
+    formatEntry(data) {
+        return (0, configuration_1.format)(data.Variables, this.Options.layout);
+    }
+    /**
+     * Flushes any buffered messages. Delegates to the queue's forceFlush so a
+     * caller ( eg. dispose or a test ) can await the drain.
+     */
+    async flush() {
+        await this.Queue.forceFlush();
+    }
+    forceFlush() {
+        return this.Queue ? this.Queue.forceFlush() : Promise.resolve();
+    }
+    /**
+     * Appends one batch as a single write, guarded by the write-lock ( the SAME
+     * lock rotation uses, so a rename can never race an append ). On failure the
+     * batch is requeued at the FRONT so nothing is lost ( never-drop, bounded by
+     * maxQueue ). This ALWAYS resolves ( never rejects ) so queue.shutdown() -
+     * driven by dispose() - never rejects.
+     */
+    async append(batch) {
+        await this.Ready.catch(() => {
+            /* init failed - error already recorded, skip appending */
+        });
+        if (!this.Fs) {
+            // init failed / fs unavailable - keep the batch for a later retry
+            this.Queue.requeueFront(batch);
             return;
         }
-        if (this.Buffer.length >= this.Options.options.maxBufferSize) {
-            this.Status = FileTargetStatus.PENDING;
-            this.WriteBuffer = [...this.WriteBuffer, ...this.Buffer];
-            this.Buffer = [];
-            // write at end of nodejs event loop all buffered messages at once
-            setImmediate(() => {
-                this.flush();
-            });
-        }
-    }
-    archive() {
-        const { ext } = path.parse(path.basename(this.Options.options.path));
-        const aFiles = glob_1.default
-            .sync(path.join(this.ArchiveDirPath, `archived_*{${ext},.gzip}`).replace(/\\/g, "/"))
-            .map((f) => {
-            return {
-                name: f,
-                stat: fs_1.default.statSync(f),
-            };
-        })
-            .sort((a, b) => a.stat.mtime.getTime() - b.stat.mtime.getTime());
-        const lFiles = glob_1.default
-            .sync(path.join(this.LogDirPath, `*${ext}`).replace(/\\/g, "/"))
-            .map((f) => {
-            return {
-                name: f,
-                stat: fs_1.default.statSync(f),
-            };
-        })
-            .sort((a, b) => a.stat.mtime.getTime() - b.stat.mtime.getTime());
-        // clear archived files above limit
-        if (aFiles.length > this.Options.options.maxArchiveFiles) {
-            for (let i = 0; i < aFiles.length - this.Options.options.maxArchiveFiles; i++) {
-                fs_1.default.unlink(aFiles[i].name, (err) => {
-                    if (err) {
-                        this.Log.error(err, `Cannot delete archived file at path ${aFiles[i - 1].name}`);
-                    }
-                    else {
-                        this.Log.info(`Deleted archived file at path ${aFiles[i].name}`);
-                    }
-                });
+        await this.withWriteLock(async () => {
+            const path = this.activePath();
+            try {
+                await this.Fs.append(path, batch.join(os_1.EOL) + os_1.EOL);
+                this.HasError = false;
+                this.Error = null;
+                // batch appended successfully - allow the next overflow episode to warn again
+                this.Overflowed = false;
+            }
+            catch (err) {
+                this.HasError = true;
+                this.Error = err;
+                this.Log.error(err, `Cannot write log messages to file target at path ${path}`);
+                // restore the batch in front of anything queued meanwhile - never drop.
+                // the queue caps at maxQueue, dropping the oldest if the sink stays down.
+                this.Queue.requeueFront(batch);
             }
-        }
-        // now move log files that are above limited file size or old
-        const filesToArchive = lFiles.filter((x) => {
-            return x.stat.size > this.Options.options.maxSize || lFiles.indexOf(x) <= lFiles.length - 2;
         });
-        if (filesToArchive.length === 0) {
-            this.ArchiveStatus = FileTargetStatus.IDLE;
-        }
-        for (let i = 0; i < filesToArchive.length; i++) {
-            const { name, ext } = path.parse(path.basename(lFiles[i].name));
-            // get number of files with same name, eg. during a day, multiple log files can be produced
-            const lArchiFiles = glob_1.default.sync(path.join(this.ArchiveDirPath, `archived_${name}*{${ext},.gzip}`).replace(/\\/g, "/"));
-            const fIndex = lodash_1.default.max(lArchiFiles.map((f) => {
-                const result = [...f.matchAll(/(\d+)(\.txt|\.gzip)/gm)];
-                if (result && result.length > 0) {
-                    return parseInt(result[0][1]);
-                }
-                return 0;
-            }));
-            const archPath = path.join(this.ArchiveDirPath, `archived_${name}_${(fIndex ?? 0) + 1}${ext}`);
-            fs_1.default.rename(lFiles[i].name, archPath, (err) => {
-                if (err) {
-                    this.Log.error(err, `Cannot move log file ${name} to archive at path ${archPath}`);
-                    return;
-                }
-                if (this.Options.options.compress) {
-                    this.Log.trace(`Compressing archive log at path ${archPath}`);
-                    const zippedPath = path.join(this.ArchiveDirPath, `archived_${name}_${lArchiFiles.length + 1}${ext}.gzip`);
-                    const zip = zlib.createGzip();
-                    const read = fs_1.default.createReadStream(archPath);
-                    const write = fs_1.default.createWriteStream(zippedPath);
-                    (0, stream_1.pipeline)(read, zip, write, (err) => {
-                        if (err) {
-                            this.Log.error(err, `Cannot compress archived file at path ${archPath}`);
-                            fs_1.default.unlink(zippedPath, () => {
-                                return;
-                            });
-                            return;
-                        }
-                        this.Log.info(`Succesyfully compressed archive log at path ${zippedPath}`);
-                        fs_1.default.unlink(archPath, (err) => {
-                            if (err) {
-                                this.Log.error(err, `Cannot delete archived log after compression at path ${archPath}`);
-                            }
-                        });
-                        this.ArchiveStatus = FileTargetStatus.IDLE;
-                    });
-                }
-                else {
-                    this.ArchiveStatus = FileTargetStatus.IDLE;
-                }
-            });
-        }
+    }
+    async dispose() {
+        this.Disposed = true;
+        // stops the flush timer and performs a final flush of anything buffered
+        await this.Queue.shutdown();
+        this.ArchiveService?.stop();
+    }
+    /**
+     * Runs `fn` under the shared write-lock. Flush and rotation both go through
+     * here, so a rename can never overlap an append.
+     */
+    withWriteLock(fn) {
+        const run = this.WriteLock.then(() => fn());
+        // keep the chain alive on failure so the lock never deadlocks
+        this.WriteLock = run.catch(() => undefined);
+        return run;
+    }
+    /**
+     * Active log path relative to the fs provider base path. Recomputed each call
+     * so dynamic ( eg. date-based ) paths work.
+     */
+    activePath() {
+        const p = (0, configuration_1.format)({ logger: this.Options.name }, this.Options.options.path);
+        return this.normalize(p);
+    }
+    /**
+     * Normalizes a configured path to forward slashes and strips a leading
+     * separator. Paths are interpreted relative to the fs provider base path -
+     * the provider itself sandboxes and resolves them, so we only canonicalize
+     * separators here.
+     */
+    normalize(p) {
+        return p.replace(/\\/g, "/").replace(/^\/+/, "");
     }
 };
 exports.FileTarget = FileTarget;