analogger 2.2.1 → 2.3.0

package/src/ana-logger.cjs

@@ -638,6 +638,9 @@ class ____AnaLogger
         hideHookMessage: false
     };
 
+    remoteBuffer = [];
+    remoteTimer = null;
+
     static Console = null;
 
     #overridenMap = {
@@ -687,6 +690,9 @@ class ____AnaLogger
         this.errorTargetHandler = this.onError.bind(this);
         this.errorUserTargetHandler = this.onErrorForUserTarget.bind(this);
 
+        this.remoteBuffer = [];
+        this.remoteTimer = null;
+
         this.setOptions(this.options);
 
         if (!____AnaLogger.Console) {
@@ -924,13 +930,17 @@ class ____AnaLogger
         this.options.pathname = undefined;
         this.options.binarypathname = undefined;
         this.options.enableDate = undefined;
+        this.options.enableMillisec = undefined;
         this.options.logToLocalStorage = undefined;
         this.options.logToLocalStorageMax = 50;
         this.options.logToLocalStorageSize = 10000;
         this.options.logToRemoteMaxEntries = undefined;
         this.options.logToRemoteDebounce = undefined;
+        this.options.logToRemoteMaxSize = undefined;
+        this.options.logToRemoteMinSize = undefined;
         this.remoteBuffer = [];
         this.remoteTimer = null;
+        this.remoteWaitCount = 0;
     }
 
     resetOptions()
@@ -939,6 +949,7 @@ class ____AnaLogger
     }
 
     setOptions({
+                   timeLenMax = undefined,
                    contextLenMax = 10,
                    idLenMax = 5,
                    lidLenMax = 6,
@@ -966,11 +977,14 @@ class ____AnaLogger
                    oneConsolePerContext = undefined,
                    silent = undefined,
                    enableDate = undefined,
+                   enableMillisec = undefined,
                    logToLocalStorage = undefined,
                    logToLocalStorageMax = 50,
                    logToLocalStorageSize = 10000,
                    logToRemoteMaxEntries = undefined,
                    logToRemoteDebounce = undefined,
+                   logToRemoteMaxSize = undefined,
+                   logToRemoteMinSize = undefined,
                    /** Remote - all optional **/
                    protocol = undefined,
                    host = undefined,
@@ -986,6 +1000,9 @@ class ____AnaLogger
         this.options.messageLenMax = messageLenMax;
         this.options.symbolLenMax = symbolLenMax;
 
+        this.options.enableMillisec = enableMillisec;
+        this.options.timeLenMax = timeLenMax;
+
         this.options.logMaxSize = logMaxSize;
         this.options.logMaxArchives = logMaxArchives;
         this.options.logIndexArchive = logIndexArchive;
@@ -997,10 +1014,23 @@ class ____AnaLogger
         this.options.requiredLogLevel = requiredLogLevel;
         this.options.enableTrace = enableTrace;
 
+        this.options.enableMillisec = enableMillisec;
+        if (this.options.enableMillisec)
+        {
+            this.options.timeLenMax += 4;
+        }
+
         this.options.logToLocalStorageMax = logToLocalStorageMax;
         this.options.logToLocalStorageSize = logToLocalStorageSize;
+
+        // Remote logging options
+        this.options.logToRemote = logToRemote;
+        this.options.logToRemoteUrl = logToRemoteUrl;
+        this.options.logToRemoteBinaryUrl = logToRemoteBinaryUrl;
         this.options.logToRemoteMaxEntries = logToRemoteMaxEntries;
         this.options.logToRemoteDebounce = logToRemoteDebounce;
+        this.options.logToRemoteMaxSize = logToRemoteMaxSize;
+        this.options.logToRemoteMinSize = logToRemoteMinSize;
 
         if (loadHtmlToImage) {
             const code = getHtmlToImage();
@@ -1058,6 +1088,19 @@ class ____AnaLogger
             }
         });
 
+        if (this.options.enableDate && this.options.timeLenMax === undefined) {
+            this.options.timeLenMax = 17;
+        }
+
+        if (this.options.timeLenMax === undefined) {
+            if (this.options.enableDate) {
+                this.options.timeLenMax = 17;
+            }
+            else {
+                this.options.timeLenMax = 8;
+            }
+        }
+
         if (this.options.logToRemote && !this.options.logToRemoteUrl)
         {
             this.options.logToRemoteUrl = this.convertToUrl({
@@ -1136,17 +1179,14 @@ class ____AnaLogger
     /**
      * Format inputs
      * @see Override {@link setLogFormat}
-     * @param contextName
-     * @param id
-     * @param message
-     * @param lid
-     * @param symbol
      * @returns {string}
+     * @param localContext
      */
-    onBuildLog({contextName, message = "", lid = "", symbol = ""} = {})
+    onBuildLog(localContext = {})
     {
         try
         {
+            let {contextName, message = "", lid = "", symbol = ""} = localContext;
             let strResult = "";
 
             const strs = message.split(/\n/g);
@@ -1159,14 +1199,22 @@ class ____AnaLogger
                 const now = new Date();
                 let time = ("0" + now.getHours()).slice(-2) + ":" + ("0" + now.getMinutes()).slice(-2) + ":" + ("0" + now.getSeconds()).slice(-2);
 
-                if (this.options.enableDate)
+                const enableMillisec = localContext.hasOwnProperty("enableMillisec") ? localContext.enableMillisec : this.options.enableMillisec;
+                if (enableMillisec)
+                {
+                    time += "," + ("00" + now.getMilliseconds()).slice(-3);
+                }
+
+                const enableDate = localContext.hasOwnProperty("enableDate") ? localContext.enableDate : this.options.enableDate;
+                if (enableDate)
                 {
                     let date = now.getFullYear().toString().slice(-2) + "-" + (now.getMonth() + 1).toString().padStart(2, "0") + "-" + now.getDate().toString().padStart(2, "0");
                     time = date + " " + time;
                 }
 
                 // Display content in columns
-                time = this.truncateMessage(time, {fit: this.options.timeLenMax});
+                const timeLenMax = localContext.hasOwnProperty("timeLenMax") ? localContext.timeLenMax : this.options.timeLenMax;
+                time = this.truncateMessage(time, {fit: timeLenMax});
 
                 if (i > 0)
                 {
@@ -1179,7 +1227,8 @@ class ____AnaLogger
                 });
                 lid = this.truncateMessage(lid, {fit: this.options.lidLenMax});
 
-                if (this.options.messageLenMax !== undefined)
+                const messageLenMax = localContext.hasOwnProperty("messageLenMax") ? localContext.messageLenMax : this.options.messageLenMax;
+                if (messageLenMax !== undefined)
                 {
                     message0 = this.truncateMessage(message0, {fit: this.options.messageLenMax});
                 }
@@ -2001,18 +2050,31 @@ class ____AnaLogger
     {
         try
         {
-            if (this.options.logToRemoteMaxEntries === undefined && this.options.logToRemoteDebounce === undefined)
+            if (this.options.logToRemoteMaxEntries === undefined && this.options.logToRemoteDebounce === undefined && this.options.logToRemoteMaxSize === undefined)
             {
                 this.performRemotePost([...data]);
                 return;
             }
 
-            this.remoteBuffer.push([...data]);
-
-            if (this.options.logToRemoteMaxEntries !== undefined && this.remoteBuffer.length >= this.options.logToRemoteMaxEntries)
+            if (Array.isArray(this.remoteBuffer))
             {
-                this.flushRemoteLogs();
-                return;
+                this.remoteBuffer.push([...data]);
+
+                if (this.options.logToRemoteMaxEntries !== undefined && this.remoteBuffer.length >= this.options.logToRemoteMaxEntries)
+                {
+                    this.flushRemoteLogs(true);
+                    return;
+                }
+
+                if (this.options.logToRemoteMaxSize !== undefined)
+                {
+                    const currentSize = JSON.stringify(this.remoteBuffer).length;
+                    if (currentSize >= this.options.logToRemoteMaxSize)
+                    {
+                        this.flushRemoteLogs(true);
+                        return;
+                    }
+                }
             }
 
             if (this.options.logToRemoteDebounce !== undefined && !this.remoteTimer)
@@ -2030,19 +2092,48 @@ class ____AnaLogger
         }
     }
 
-    flushRemoteLogs()
+    flushRemoteLogs(force = false)
     {
-        if (this.remoteTimer)
+        if (this.remoteBuffer.length === 0)
         {
-            clearTimeout(this.remoteTimer);
-            this.remoteTimer = null;
+            return;
         }
 
-        if (this.remoteBuffer.length === 0)
+        if (!force && this.options.logToRemoteMinSize !== undefined)
         {
-            return;
+            const currentSize = JSON.stringify(this.remoteBuffer).length;
+            if (currentSize < this.options.logToRemoteMinSize)
+            {
+                // If we haven't reached min size, increment wait count
+                this.remoteWaitCount = (this.remoteWaitCount || 0) + 1;
+
+                // If we've waited long enough (e.g. 1 consecutive skip), flush anyway
+                if (this.remoteWaitCount < 2)
+                {
+                    // If we haven't reached min size, and there's no timer, start one if debounce is set
+                    if (this.options.logToRemoteDebounce !== undefined)
+                    {
+                        if (this.remoteTimer)
+                        {
+                            clearTimeout(this.remoteTimer);
+                        }
+                        this.remoteTimer = setTimeout(() =>
+                        {
+                            this.flushRemoteLogs();
+                        }, this.options.logToRemoteDebounce);
+                    }
+                    return;
+                }
+            }
+        }
+
+        if (this.remoteTimer)
+        {
+            clearTimeout(this.remoteTimer);
+            this.remoteTimer = null;
         }
 
+        this.remoteWaitCount = 0;
         const dataToFlush = [...this.remoteBuffer];
         this.remoteBuffer = [];
 

package/src/ana-logger.d.cts

@@ -99,7 +99,7 @@ declare class ____AnaLogger {
     isBrowser(): boolean;
     resetLogger(): void;
     resetOptions(): void;
-    setOptions({ contextLenMax, idLenMax, lidLenMax, symbolLenMax, messageLenMax, hideLog, hideError, hideHookMessage, hidePassingTests, logToDom, logToFile, logMaxSize, logMaxArchives, logIndexArchive, addArchiveTimestamp, addArchiveIndex, compressArchives, compressionLevel, logToRemote, logToRemoteUrl, logToRemoteBinaryUrl, loopback, requiredLogLevel, oneConsolePerContext, silent, enableDate, protocol, host, port, pathname, binarypathname }?: any): void;
+    setOptions({ contextLenMax, idLenMax, lidLenMax, symbolLenMax, messageLenMax, hideLog, hideError, hideHookMessage, hidePassingTests, logToDom, logToFile, logMaxSize, logMaxArchives, logIndexArchive, addArchiveTimestamp, addArchiveIndex, compressArchives, compressionLevel, logToRemote, logToRemoteUrl, logToRemoteBinaryUrl, loopback, requiredLogLevel, oneConsolePerContext, silent, enableDate, enableMillisec, protocol, host, port, pathname, binarypathname }?: any): void;
     EOL: string;
     getOptions(): {
         hideHookMessage: boolean;