@paroicms/ui-logger 1.14.2 → 1.15.0

package/dist/ui-logger.d.ts

@@ -24,12 +24,13 @@ export interface UiLoggerOptions {
 }
 export interface SendToServerOptions {
     minLevel?: UiLoggerLevels;
-    sendToServer?(lines: FrontLogLine[]): Promise<void>;
+    sendToServer?(lines: FrontLogLine[]): Promise<SendStatus>;
 }
 export interface FrontLogLine {
-    message: string[];
+    message: string;
     level: UiLoggerStrictLevels;
 }
+export type SendStatus = "NOT_READY" | "DONE" | "CANCEL";
 export declare function createNoUiLogger(): FullUiLogger;
 export declare function createUiLogger(mainOptions?: UiLoggerOptions): FullUiLogger;
 type WrapAsync = <T extends (...args: any[]) => Promise<any>>(fn: T) => (...args: Parameters<T>) => void;

package/dist/ui-logger.js

@@ -79,6 +79,7 @@ function makeToServer(send, consoleLog) {
 }
 function createSendMiddleware(options) {
     const logErrorFromBackend = toLevelNum(options.minLevel ?? "none") >= toLevelNum("error");
+    const sendMinLevel = options.minLevel ?? "none";
     const postLog = options.sendToServer
         ? new PostLogToBackend({
             sendToServer: options.sendToServer,
@@ -87,7 +88,7 @@ function createSendMiddleware(options) {
         : undefined;
     return (level, cb) => (...message) => {
         cb(...message);
-        if (postLog) {
+        if (postLog && toLevelNum(level) <= toLevelNum(sendMinLevel)) {
             postLog.addLogLineToPost({
                 message,
                 level,
@@ -117,6 +118,8 @@ class PostLogToBackend {
     options;
     lines = [];
     timeoutId;
+    sending = false;
+    retryDelayMs = 500;
     constructor(options) {
         this.options = options;
     }
@@ -126,44 +129,69 @@ class PostLogToBackend {
     }
     delayedSend() {
         if (this.timeoutId !== undefined) {
-            if (this.lines.length >= 20)
-                return;
             clearTimeout(this.timeoutId);
+            this.timeoutId = undefined;
+            if (this.lines.length >= 20) {
+                void this.#flush();
+                return;
+            }
         }
         this.timeoutId = setTimeout(() => {
             this.timeoutId = undefined;
-            if (this.lines.length > 0) {
-                void postLogFromFrontend({
-                    ...this.options,
-                    lines: this.lines,
-                });
-                this.lines = [];
-            }
+            void this.#flush();
         }, 50);
     }
+    async #flush() {
+        if (this.sending || this.lines.length === 0)
+            return;
+        const batch = this.lines;
+        this.lines = [];
+        this.sending = true;
+        const status = await postLogFromFrontend({
+            ...this.options,
+            lines: batch,
+        });
+        this.sending = false;
+        if (status === "NOT_READY") {
+            this.lines = batch.concat(this.lines);
+            setTimeout(() => this.delayedSend(), this.retryDelayMs);
+            return;
+        }
+        // On CANCEL: do nothing further; messages already went to console via cb
+        if (this.lines.length > 0)
+            this.delayedSend();
+    }
 }
 async function postLogFromFrontend({ lines, sendToServer, logErrorFromBackend, }) {
     try {
         for (const line of lines)
-            line.message = line.message.map(anyMessageToStringifiable);
-        await sendToServer(lines.map((line) => ({
-            message: line.message.map(messageOf),
+            line.message = line.message.map((msg) => anyMessageToStringifiable(msg));
+        const status = await sendToServer(lines.map((line) => ({
+            message: line.message.map(messageOf).join(" "),
             level: line.level,
         })));
+        return status;
     }
     catch (err) {
         if (logErrorFromBackend && window.console?.error) {
             console.error("Cannot send log to backend:", err);
         }
+        return "CANCEL";
     }
 }
-function anyMessageToStringifiable(message) {
+function anyMessageToStringifiable(message, seen = new WeakSet()) {
     if (message === null)
         return null;
     if (Number.isNaN(message))
         return "[NaN]";
-    if (Array.isArray(message))
-        return message.map((item) => anyMessageToStringifiable(item));
+    if (Array.isArray(message)) {
+        if (seen.has(message))
+            return "[Circular Array]";
+        seen.add(message);
+        const result = message.map((item) => anyMessageToStringifiable(item, seen));
+        seen.delete(message);
+        return result;
+    }
     if (message instanceof Error)
         return message.message ?? message.name ?? "[Error]";
     switch (typeof message) {
@@ -176,13 +204,18 @@ function anyMessageToStringifiable(message) {
         case "bigint":
             return `${message.toString()}n`;
         case "function":
-            return "[Function]";
+            return message.name ? `[Function: ${message.name}]` : "[Function]";
         case "symbol":
             return "[Symbol]";
         case "object": {
+            if (seen.has(message))
+                return "[Circular]";
+            seen.add(message);
             const obj = {};
-            for (const key of Object.keys(message))
-                obj[key] = anyMessageToStringifiable(message[key]);
+            for (const key of Object.keys(message)) {
+                obj[key] = anyMessageToStringifiable(message[key], seen);
+            }
+            seen.delete(message);
             return obj;
         }
         default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/ui-logger",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "description": "Logger for the Admin UI front of a Paroi CMS.",
   "keywords": [
     "paroicms",
@@ -20,7 +20,9 @@
   "scripts": {
     "build": "tsc",
     "clear": "rimraf dist/*",
-    "dev": "tsc --watch --preserveWatchOutput"
+    "dev": "tsc --watch --preserveWatchOutput",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "@paroicms/public-anywhere-lib": "0.37.0"
@@ -28,7 +30,8 @@
   "devDependencies": {
     "rimraf": "~6.0.1",
     "typescript": "~5.9.2",
-    "react": "~19.1.0"
+    "react": "~19.1.0",
+    "vitest": "~3.2.3"
   },
   "files": [
     "dist"