miqro 7.0.9 → 7.0.10

package/build/esm/src/inflate/inflate-sea.js

@@ -1,7 +1,7 @@
 import { chmodSync, constants, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { cwd, platform } from "node:process";
-import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getWSConfigPath } from "../common/paths.js";
+import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getLogConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getWSConfigPath } from "../common/paths.js";
 import { getAsset } from "../common/assets.js";
 import { migration } from "@miqro/query";
 import { esBuild } from "../common/esbuild.js";
@@ -40,6 +40,9 @@ export async function inflateAppForSea(logger, inflateDir, services, port) {
     const WSLIST = services.filter(service => getWSConfigPath(resolve(cwd(), service))).map(service => {
         return `(await require("../${service}/ws.cjs")).default`;
     }).join(",");
+    const LOGCONFIGLIST = services.filter(service => getLogConfigPath(resolve(cwd(), service))).map(service => {
+        return `{config: (await require("../${service}/log.cjs")).default, service: "${service}" }`;
+    }).join(",");
     const SERVERCONFIGLIST = services.filter(service => getServerConfigPath(resolve(cwd(), service))).map(service => {
         return `(await require("../${service}/server.cjs")).default`;
     }).join(",\n");
@@ -56,21 +59,38 @@ export async function inflateAppForSea(logger, inflateDir, services, port) {
   })`;
     }).join(",");
     writeFile(logger, join(inflateDir, "sea", "package.json"), `{ "type": "module", "private": true }`);
-    writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
+    writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createLogProviderOptions, createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
 
 async function main() {
-  const PORT = "${PORT}"; 
-  const loggerProvider = new LogProvider();
+  const PORT = "${PORT}";
+
+  const logConfigList = await Promise.all([${LOGCONFIGLIST}]);
+
+  const loggerProvider = new LogProvider(createLogProviderOptions({
+    inflated: {
+      logConfigMap: logConfigList.reduce((ret, config)=>{
+        ret[config.service] = config.config;
+        return ret;
+      }, {})
+    }
+  }));
+  const logger = loggerProvider.getLogger("SERVER");
   const localCache = new LocalCache();
   const cache = new ClusterCache();
-  const webSocketManager = new WebSocketManager();
-  const dbManager = new DBManager();
+  const webSocketManager = new WebSocketManager({
+    loggerProvider,
+    logger
+  });
+  const dbManager = new DBManager({
+    loggerProvider,
+    logger
+  });
   const serverInterface = createServerInterface({
     cache,
     localCache,
     loggerProvider,
     webSocketManager,
-    logger: loggerProvider.getLogger("server"),
+    logger,
     dbManager,
     port: PORT
   });
@@ -81,6 +101,7 @@ async function main() {
 
   ${!WSLIST ? "" : `\n  webSocketManager.replaceALLWS(await Promise.all([${WSLIST}]))`}
   const app = new App({
+    loggerFactory: loggerProvider.requestLoggerFactory,
     onUpgrade: (req, socket, head) => {
       try {
         req.server = serverInterface;

package/build/esm/src/lib.d.ts

@@ -8,6 +8,7 @@ export { DBManager } from "./services/utils/db-manager.js";
 export { LogProvider, LogProviderOptions } from "./services/utils/log.js";
 export { Miqro, MiqroOptions, ServerRequestHandler } from "./services/app.js";
 export { jsx2HTML } from "./common/jsx.js";
+export { createLogProviderOptions } from "./services/utils/log-transport.js";
 export { appendAPIModule } from "./inflate/utils/sea-utils.js";
 export { createServerInterface, ServerInterfaceImplOptions } from "./services/utils/server-interface.js";
 export { App, LoggerHandler, Router } from "@miqro/core";

package/build/esm/src/lib.js

@@ -13,6 +13,7 @@ export { Miqro, ServerRequestHandler } from "./services/app.js";
 // export { initGlobals, assertGlobalTampered } from "./services/globals.js";
 export { jsx2HTML } from "./common/jsx.js";
 //exported for --inflate-sea
+export { createLogProviderOptions } from "./services/utils/log-transport.js";
 export { appendAPIModule } from "./inflate/utils/sea-utils.js";
 export { createServerInterface } from "./services/utils/server-interface.js";
 export { App, LoggerHandler, Router } from "@miqro/core";

package/build/esm/src/services/app.js

@@ -5,7 +5,7 @@ import { WebSocketManager } from "./utils/websocketmanager.js";
 import { DBManager } from "./utils/db-manager.js";
 import { inflateApp } from "../inflate/inflate.js";
 import { setupServerConfig } from "../inflate/setup-server-config.js";
-import { BASEEDITOR_PATH, LOG_SOCKET_PATH } from "../../editor/common/constants.js";
+import { BASEEDITOR_PATH, LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../editor/common/constants.js";
 import editorWSConfig from "../../editor/ws.js";
 import editorServerConfig from "../../editor/server.js";
 import { ClusterCache } from "./utils/cluster-cache.js";
@@ -51,7 +51,9 @@ export class Miqro {
             services: [],
             ...(options ? options : {})
         };
-        this.loggerProvider = new LogProvider(createLogProviderOptions(this));
+        const loggerOptions = createLogProviderOptions(this);
+        loggerOptions.transports.push(createEditorLoggerTransport(this));
+        this.loggerProvider = new LogProvider(loggerOptions);
         //if (!this.options.logger) {
         const SERVER_IDENTIFIER = cluster.isPrimary ?
             "" :
@@ -588,3 +590,32 @@ export function notifiyServerConfigSync(app, method) {
         });
     }
 }
+function createEditorLoggerTransport(app) {
+    return {
+        level: "trace",
+        write: async (args) => {
+            try {
+                if (app.options.editor) {
+                    try {
+                        const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
+                        if (ws) {
+                            //console.log("\n\n" + process.pid + " broadcasting " + LOG_SOCKET_PATH + "\n\n\n")
+                            await ws.broadcast(JSON.stringify({
+                                type: LOG_WRITE_EVENT,
+                                level: args.level,
+                                identifier: args.identifier,
+                                out: args.out
+                            }));
+                        }
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
+    };
+}

package/build/esm/src/services/utils/log-transport.d.ts

@@ -1,6 +1,18 @@
 import { LoggerTransport, WriteArgs } from "@miqro/core";
-import { Miqro } from "../app.js";
-export declare function createLogProviderOptions(app: Miqro): {
+import { LogConfigMap } from "../../inflate/setup-log.js";
+import { LogProviderOptions } from "./log.js";
+export declare function createLogProviderOptions(app?: {
+    options?: {
+        dateTimeFormatOptions?: Intl.DateTimeFormatOptions;
+        logProviderOptions?: LogProviderOptions;
+        name?: string;
+        editor?: boolean;
+        logFile?: string | boolean;
+    };
+    inflated?: {
+        logConfigMap: LogConfigMap;
+    };
+}): {
     name: string;
     transports: LoggerTransport[];
     formatter: (args: WriteArgs) => string;

package/build/esm/src/services/utils/log-transport.js

@@ -1,38 +1,46 @@
 import { ConsoleTransport, FileTransport } from "@miqro/core";
 import { format } from "node:util";
-import { LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../../editor/common/constants.js";
 export function createLogProviderOptions(app) {
     const defaultConsole = ConsoleTransport();
     //console.log("app.options.logFile [%s]", app.options.logFile);
-    const defaultFile = app.options.logFile !== true && app.options.logFile !== false && String(app.options.logFile).toUpperCase() !== "TRUE" && String(app.options.logFile).toUpperCase() !== "FALSE" &&
+    const defaultFile = app && app.options && app?.options?.logFile !== true && app?.options?.logFile !== false && String(app?.options?.logFile).toUpperCase() !== "TRUE" && String(app?.options?.logFile).toUpperCase() !== "FALSE" &&
         app.options.logFile ? FileTransport(app.options.logFile) :
-        String(app.options.logFile).toUpperCase() === "TRUE" || app.options.logFile === true || app.options.logFile === undefined ?
+        app && app.options && String(app?.options?.logFile).toUpperCase() === "TRUE" || app?.options?.logFile === true || app?.options?.logFile === undefined ?
             FileTransport() :
             undefined;
     const defaultWrite = async (args, level) => {
         try {
-            const serviceNamesWithLogConfigReplaceConsole = level === undefined && app.inflated ?
-                Object.keys(app.inflated.logConfigMap).filter(serviceName => app.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
-            const serviceNamesWithLogConfigReplaceFile = level === undefined && app.inflated ?
-                Object.keys(app.inflated.logConfigMap).filter(serviceName => app.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
+            // console.dir(app.inflated);
+            const serviceNamesWithLogConfigReplaceConsole = app?.inflated ?
+                Object.keys(app?.inflated?.logConfigMap).filter(serviceName => app?.inflated?.logConfigMap[serviceName].replaceConsoleTransport) : [];
+            const serviceNamesWithLogConfigReplaceFile = app?.inflated ?
+                Object.keys(app?.inflated?.logConfigMap).filter(serviceName => app?.inflated?.logConfigMap[serviceName].replaceFileTransport) : [];
+            // console.dir(level);
+            // console.dir(app?.inflated?.logConfigMap["m-admin"])
+            // console.dir(serviceNamesWithLogConfigReplaceConsole.length);
+            // console.dir(serviceNamesWithLogConfigReplaceFile.length);
             await Promise.allSettled((level === undefined ?
                 [
                     level === undefined && serviceNamesWithLogConfigReplaceConsole.length === 0 && defaultConsole ?
                         defaultConsole.write(args) : Promise.resolve(),
                     level === undefined && serviceNamesWithLogConfigReplaceFile.length === 0 && defaultFile ?
                         defaultFile.write(args) : Promise.resolve()
-                ] : []).concat(app.inflated ?
-                Object.keys(app.inflated.logConfigMap).map(serviceName => app.inflated.logConfigMap[serviceName]).filter(c => c.level === level).map(c => c.write(args)) : []));
+                ] : []).concat(app && app.inflated && app?.inflated ?
+                Object.keys(app?.inflated?.logConfigMap).map(serviceName => app?.inflated?.logConfigMap[serviceName]).filter(c => c.level === level).map(c => c.write(args)) : []));
         }
         catch (e) {
             console.error(e);
         }
     };
     return {
-        name: app.options.name,
+        name: app?.options?.name,
         formatter: (args) => {
             const params = args.optionalParams;
-            return format(`${new Date().toISOString()} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? (args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] `) : ""}${args.message}`, ...params);
+            return format(`${new Date().toLocaleDateString(undefined, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+                hour12: false
+            })} ${new Date().toLocaleTimeString(undefined, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+                hour12: false
+            })} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? (args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] `) : ""}${args.message}`, ...params);
         },
         transports: [
             ...([undefined, "error", "warn", "info", "debug", "trace"].map(level => {
@@ -46,34 +54,8 @@ export function createLogProviderOptions(app) {
                         await defaultWrite(args, undefined);
                     }
                 };
-            })), {
-                level: "trace",
-                write: async (args) => {
-                    try {
-                        if (app.options.editor) {
-                            try {
-                                const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
-                                if (ws) {
-                                    //console.log("\n\n" + process.pid + " broadcasting " + LOG_SOCKET_PATH + "\n\n\n")
-                                    await ws.broadcast(JSON.stringify({
-                                        type: LOG_WRITE_EVENT,
-                                        level: args.level,
-                                        identifier: args.identifier,
-                                        out: args.out
-                                    }));
-                                }
-                            }
-                            catch (e) {
-                                console.error(e);
-                            }
-                        }
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }
-            }
+            }))
         ],
-        ...(app.options.logProviderOptions ? app.options.logProviderOptions : {})
+        ...(app?.options?.logProviderOptions ? app?.options?.logProviderOptions : {})
     };
 }

package/build/lib.cjs

@@ -7133,6 +7133,7 @@ __export(lib_exports3, {
   ServerRequestHandler: () => ServerRequestHandler,
   WebSocketManager: () => WebSocketManager,
   appendAPIModule: () => appendAPIModule,
+  createLogProviderOptions: () => createLogProviderOptions,
   createServerInterface: () => createServerInterface,
   jsx: () => lib_exports,
   jsx2HTML: () => jsx2HTML,
@@ -13053,6 +13054,9 @@ async function inflateAppForSea(logger, inflateDir, services, port) {
   const WSLIST = services.filter((service) => getWSConfigPath((0, import_node_path14.resolve)((0, import_node_process10.cwd)(), service))).map((service) => {
     return `(await require("../${service}/ws.cjs")).default`;
   }).join(",");
+  const LOGCONFIGLIST = services.filter((service) => getLogConfigPath((0, import_node_path14.resolve)((0, import_node_process10.cwd)(), service))).map((service) => {
+    return `{config: (await require("../${service}/log.cjs")).default, service: "${service}" }`;
+  }).join(",");
   const SERVERCONFIGLIST = services.filter((service) => getServerConfigPath((0, import_node_path14.resolve)((0, import_node_process10.cwd)(), service))).map((service) => {
     return `(await require("../${service}/server.cjs")).default`;
   }).join(",\n");
@@ -13072,21 +13076,38 @@ async function inflateAppForSea(logger, inflateDir, services, port) {
   writeFile2(
     logger,
     (0, import_node_path14.join)(inflateDir, "sea", "app.cjs"),
-    `const { createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
+    `const { createLogProviderOptions, createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
 
 async function main() {
-  const PORT = "${PORT2}"; 
-  const loggerProvider = new LogProvider();
+  const PORT = "${PORT2}";
+
+  const logConfigList = await Promise.all([${LOGCONFIGLIST}]);
+
+  const loggerProvider = new LogProvider(createLogProviderOptions({
+    inflated: {
+      logConfigMap: logConfigList.reduce((ret, config)=>{
+        ret[config.service] = config.config;
+        return ret;
+      }, {})
+    }
+  }));
+  const logger = loggerProvider.getLogger("SERVER");
   const localCache = new LocalCache();
   const cache = new ClusterCache();
-  const webSocketManager = new WebSocketManager();
-  const dbManager = new DBManager();
+  const webSocketManager = new WebSocketManager({
+    loggerProvider,
+    logger
+  });
+  const dbManager = new DBManager({
+    loggerProvider,
+    logger
+  });
   const serverInterface = createServerInterface({
     cache,
     localCache,
     loggerProvider,
     webSocketManager,
-    logger: loggerProvider.getLogger("server"),
+    logger,
     dbManager,
     port: PORT
   });
@@ -13100,6 +13121,7 @@ async function main() {
   ${!WSLIST ? "" : `
   webSocketManager.replaceALLWS(await Promise.all([${WSLIST}]))`}
   const app = new App({
+    loggerFactory: loggerProvider.requestLoggerFactory,
     onUpgrade: (req, socket, head) => {
       try {
         req.server = serverInterface;
@@ -16850,30 +16872,33 @@ function getPORT() {
 // src/services/utils/log-transport.ts
 init_lib3();
 var import_node_util3 = require("node:util");
-init_constants();
 function createLogProviderOptions(app) {
   const defaultConsole = ConsoleTransport();
-  const defaultFile = app.options.logFile !== true && app.options.logFile !== false && String(app.options.logFile).toUpperCase() !== "TRUE" && String(app.options.logFile).toUpperCase() !== "FALSE" && app.options.logFile ? FileTransport(app.options.logFile) : String(app.options.logFile).toUpperCase() === "TRUE" || app.options.logFile === true || app.options.logFile === void 0 ? FileTransport() : void 0;
+  const defaultFile = app && app.options && app?.options?.logFile !== true && app?.options?.logFile !== false && String(app?.options?.logFile).toUpperCase() !== "TRUE" && String(app?.options?.logFile).toUpperCase() !== "FALSE" && app.options.logFile ? FileTransport(app.options.logFile) : app && app.options && String(app?.options?.logFile).toUpperCase() === "TRUE" || app?.options?.logFile === true || app?.options?.logFile === void 0 ? FileTransport() : void 0;
   const defaultWrite = async (args, level) => {
     try {
-      const serviceNamesWithLogConfigReplaceConsole = level === void 0 && app.inflated ? Object.keys(app.inflated.logConfigMap).filter((serviceName) => app.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
-      const serviceNamesWithLogConfigReplaceFile = level === void 0 && app.inflated ? Object.keys(app.inflated.logConfigMap).filter((serviceName) => app.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
+      const serviceNamesWithLogConfigReplaceConsole = app?.inflated ? Object.keys(app?.inflated?.logConfigMap).filter((serviceName) => app?.inflated?.logConfigMap[serviceName].replaceConsoleTransport) : [];
+      const serviceNamesWithLogConfigReplaceFile = app?.inflated ? Object.keys(app?.inflated?.logConfigMap).filter((serviceName) => app?.inflated?.logConfigMap[serviceName].replaceFileTransport) : [];
       await Promise.allSettled((level === void 0 ? [
         level === void 0 && serviceNamesWithLogConfigReplaceConsole.length === 0 && defaultConsole ? defaultConsole.write(args) : Promise.resolve(),
         level === void 0 && serviceNamesWithLogConfigReplaceFile.length === 0 && defaultFile ? defaultFile.write(args) : Promise.resolve()
       ] : []).concat(
-        app.inflated ? Object.keys(app.inflated.logConfigMap).map((serviceName) => app.inflated.logConfigMap[serviceName]).filter((c) => c.level === level).map((c) => c.write(args)) : []
+        app && app.inflated && app?.inflated ? Object.keys(app?.inflated?.logConfigMap).map((serviceName) => app?.inflated?.logConfigMap[serviceName]).filter((c) => c.level === level).map((c) => c.write(args)) : []
       ));
     } catch (e) {
       console.error(e);
     }
   };
   return {
-    name: app.options.name,
+    name: app?.options?.name,
     formatter: (args) => {
       const params = args.optionalParams;
       return (0, import_node_util3.format)(
-        `${(/* @__PURE__ */ new Date()).toISOString()} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] ` : ""}${args.message}`,
+        `${(/* @__PURE__ */ new Date()).toLocaleDateString(void 0, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+          hour12: false
+        })} ${(/* @__PURE__ */ new Date()).toLocaleTimeString(void 0, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+          hour12: false
+        })} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] ` : ""}${args.message}`,
         ...params
       );
     },
@@ -16889,33 +16914,9 @@ function createLogProviderOptions(app) {
             await defaultWrite(args, void 0);
           }
         };
-      }),
-      {
-        level: "trace",
-        write: async (args) => {
-          try {
-            if (app.options.editor) {
-              try {
-                const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
-                if (ws) {
-                  await ws.broadcast(JSON.stringify({
-                    type: LOG_WRITE_EVENT,
-                    level: args.level,
-                    identifier: args.identifier,
-                    out: args.out
-                  }));
-                }
-              } catch (e) {
-                console.error(e);
-              }
-            }
-          } catch (e) {
-            console.error(e);
-          }
-        }
-      }
+      })
     ],
-    ...app.options.logProviderOptions ? app.options.logProviderOptions : {}
+    ...app?.options?.logProviderOptions ? app?.options?.logProviderOptions : {}
   };
 }
 
@@ -16982,7 +16983,9 @@ var Miqro = class _Miqro {
       services: [],
       ...options ? options : {}
     };
-    this.loggerProvider = new LogProvider(createLogProviderOptions(this));
+    const loggerOptions = createLogProviderOptions(this);
+    loggerOptions.transports.push(createEditorLoggerTransport(this));
+    this.loggerProvider = new LogProvider(loggerOptions);
     const SERVER_IDENTIFIER = import_node_cluster3.default.isPrimary ? "" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}`.toUpperCase() : `WORKER`;
     this.logger = this.options.logger ? this.options.logger : this.loggerProvider.getLogger(SERVER_IDENTIFIER);
     this.listener = async (data) => {
@@ -17451,6 +17454,32 @@ function notifiyServerConfigSync(app, method) {
     });
   }
 }
+function createEditorLoggerTransport(app) {
+  return {
+    level: "trace",
+    write: async (args) => {
+      try {
+        if (app.options.editor) {
+          try {
+            const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
+            if (ws) {
+              await ws.broadcast(JSON.stringify({
+                type: LOG_WRITE_EVENT,
+                level: args.level,
+                identifier: args.identifier,
+                out: args.out
+              }));
+            }
+          } catch (e) {
+            console.error(e);
+          }
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  };
+}
 
 // src/inflate/utils/sea-utils.ts
 var import_node_path31 = require("node:path");
@@ -17488,6 +17517,7 @@ var JSX2 = {
   ServerRequestHandler,
   WebSocketManager,
   appendAPIModule,
+  createLogProviderOptions,
   createServerInterface,
   jsx,
   jsx2HTML,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "7.0.9",
+  "version": "7.0.10",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",

package/src/inflate/inflate-sea.ts

@@ -4,7 +4,7 @@ import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { cwd, platform } from "node:process";
 
 import { RouteFileMap, StaticFileMap } from "./setup-http.js";
-import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getServicePath, getWSConfigPath } from "../common/paths.js";
+import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getLogConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getServicePath, getWSConfigPath } from "../common/paths.js";
 import { getAsset } from "../common/assets.js";
 import { migration } from "@miqro/query";
 import { esBuild } from "../common/esbuild.js";
@@ -48,7 +48,11 @@ export async function inflateAppForSea(logger: Logger, inflateDir: string, servi
 
   const WSLIST = services.filter(service => getWSConfigPath(resolve(cwd(), service))).map(service => {
     return `(await require("../${service}/ws.cjs")).default`;
-  }).join(",")
+  }).join(",");
+
+  const LOGCONFIGLIST = services.filter(service => getLogConfigPath(resolve(cwd(), service))).map(service => {
+    return `{config: (await require("../${service}/log.cjs")).default, service: "${service}" }`;
+  }).join(",");
 
   const SERVERCONFIGLIST = services.filter(service => getServerConfigPath(resolve(cwd(), service))).map(service => {
     return `(await require("../${service}/server.cjs")).default`;
@@ -69,21 +73,38 @@ export async function inflateAppForSea(logger: Logger, inflateDir: string, servi
 
   writeFile(logger, join(inflateDir, "sea", "package.json"), `{ "type": "module", "private": true }`);
 
-  writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
+  writeFile(logger, join(inflateDir, "sea", "app.cjs"), `const { createLogProviderOptions, createServerInterface, ServerRequestHandler, WebSocketManager, DBManager, App, LoggerHandler, LogProvider, LocalCache, ClusterCache } = require("./lib.cjs");
 
 async function main() {
-  const PORT = "${PORT}"; 
-  const loggerProvider = new LogProvider();
+  const PORT = "${PORT}";
+
+  const logConfigList = await Promise.all([${LOGCONFIGLIST}]);
+
+  const loggerProvider = new LogProvider(createLogProviderOptions({
+    inflated: {
+      logConfigMap: logConfigList.reduce((ret, config)=>{
+        ret[config.service] = config.config;
+        return ret;
+      }, {})
+    }
+  }));
+  const logger = loggerProvider.getLogger("SERVER");
   const localCache = new LocalCache();
   const cache = new ClusterCache();
-  const webSocketManager = new WebSocketManager();
-  const dbManager = new DBManager();
+  const webSocketManager = new WebSocketManager({
+    loggerProvider,
+    logger
+  });
+  const dbManager = new DBManager({
+    loggerProvider,
+    logger
+  });
   const serverInterface = createServerInterface({
     cache,
     localCache,
     loggerProvider,
     webSocketManager,
-    logger: loggerProvider.getLogger("server"),
+    logger,
     dbManager,
     port: PORT
   });
@@ -94,6 +115,7 @@ async function main() {
 
   ${!WSLIST ? "" : `\n  webSocketManager.replaceALLWS(await Promise.all([${WSLIST}]))`}
   const app = new App({
+    loggerFactory: loggerProvider.requestLoggerFactory,
     onUpgrade: (req, socket, head) => {
       try {
         req.server = serverInterface;

package/src/lib.ts

@@ -16,6 +16,7 @@ export { Miqro, MiqroOptions, ServerRequestHandler } from "./services/app.js";
 export { jsx2HTML } from "./common/jsx.js";
 
 //exported for --inflate-sea
+export { createLogProviderOptions } from "./services/utils/log-transport.js";
 export { appendAPIModule } from "./inflate/utils/sea-utils.js";
 export { createServerInterface, ServerInterfaceImplOptions } from "./services/utils/server-interface.js";
 export { App, LoggerHandler, Router } from "@miqro/core";

package/src/services/app.ts

@@ -1,5 +1,5 @@
 import cluster from "node:cluster";
-import { App, Router, Logger, LoggerHandler } from "@miqro/core";
+import { App, Router, Logger, LoggerHandler, LogLevel } from "@miqro/core";
 import { migration } from "@miqro/query";
 import { WebSocketManager } from "./utils/websocketmanager.js";
 import { DBManager } from "./utils/db-manager.js";
@@ -8,7 +8,7 @@ import { InflateError } from "../common/jsx.js";
 import { DBConfig, MigrateOptions, ServerInterface, ServerRequest, WSConfig } from "../types.js";
 import { RouteFileMap } from "../inflate/setup-http.js";
 import { ServerConfigMap, setupServerConfig } from "../inflate/setup-server-config.js";
-import { BASEEDITOR_PATH, LOG_SOCKET_PATH } from "../../editor/common/constants.js";
+import { BASEEDITOR_PATH, LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../editor/common/constants.js";
 import editorWSConfig from "../../editor/ws.js";
 import editorServerConfig from "../../editor/server.js";
 
@@ -107,7 +107,11 @@ export class Miqro {
       services: [],
       ...(options ? options : {})
     };
-    this.loggerProvider = new LogProvider(createLogProviderOptions(this));
+
+    const loggerOptions = createLogProviderOptions(this);
+    loggerOptions.transports.push(createEditorLoggerTransport(this));
+    this.loggerProvider = new LogProvider(loggerOptions);
+
     //if (!this.options.logger) {
     const SERVER_IDENTIFIER = cluster.isPrimary ?
       "" :
@@ -701,3 +705,31 @@ export function notifiyServerConfigSync(app: Miqro, method: "unload" | "stop") {
     });
   }
 }
+
+function createEditorLoggerTransport(app: Miqro) {
+  return {
+    level: "trace" as LogLevel,
+    write: async (args) => {
+      try {
+        if (app.options.editor) {
+          try {
+            const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
+            if (ws) {
+              //console.log("\n\n" + process.pid + " broadcasting " + LOG_SOCKET_PATH + "\n\n\n")
+              await ws.broadcast(JSON.stringify({
+                type: LOG_WRITE_EVENT,
+                level: args.level,
+                identifier: args.identifier,
+                out: args.out
+              }));
+            }
+          } catch (e) {
+            console.error(e);
+          }
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  }
+}

package/src/services/utils/log-transport.ts

@@ -2,41 +2,65 @@ import { ConsoleTransport, FileTransport, LoggerTransport, LoggerTransportWriteA
 import { format } from "node:util";
 import { LOG_SOCKET_PATH, LOG_WRITE_EVENT } from "../../../editor/common/constants.js";
 import { Miqro } from "../app.js";
+import { LogConfigMap } from "../../inflate/setup-log.js";
+// import { WebSocketManager } from "./websocketmanager.js";
+import { LogProviderOptions } from "./log.js";
 
-export function createLogProviderOptions(app: Miqro) {
+export function createLogProviderOptions(app?: {
+  options?: {
+    dateTimeFormatOptions?: Intl.DateTimeFormatOptions;
+    logProviderOptions?: LogProviderOptions;
+    name?: string;
+    editor?: boolean;
+    logFile?: string | boolean;
+  },
+  inflated?: {
+    logConfigMap: LogConfigMap;
+  }
+}) {
   const defaultConsole = ConsoleTransport();
   //console.log("app.options.logFile [%s]", app.options.logFile);
   const defaultFile: LoggerTransport | undefined =
-    app.options.logFile !== true && app.options.logFile !== false && String(app.options.logFile).toUpperCase() !== "TRUE" && String(app.options.logFile).toUpperCase() !== "FALSE" &&
+    app && app.options && app?.options?.logFile !== true && app?.options?.logFile !== false && String(app?.options?.logFile).toUpperCase() !== "TRUE" && String(app?.options?.logFile).toUpperCase() !== "FALSE" &&
       app.options.logFile ? FileTransport(app.options.logFile) :
-      String(app.options.logFile).toUpperCase() === "TRUE" || app.options.logFile === true || app.options.logFile === undefined ?
+      app && app.options && String(app?.options?.logFile).toUpperCase() === "TRUE" || app?.options?.logFile === true || app?.options?.logFile === undefined ?
         FileTransport() :
         undefined;
   const defaultWrite = async (args: LoggerTransportWriteArgs, level?: LogLevel) => {
     try {
-      const serviceNamesWithLogConfigReplaceConsole = level === undefined && app.inflated ?
-        Object.keys(app.inflated.logConfigMap).filter(serviceName => app.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
-      const serviceNamesWithLogConfigReplaceFile = level === undefined && app.inflated ?
-        Object.keys(app.inflated.logConfigMap).filter(serviceName => app.inflated.logConfigMap[serviceName].replaceFileTransport) : [];
+      // console.dir(app.inflated);
+      const serviceNamesWithLogConfigReplaceConsole = app?.inflated ?
+        Object.keys(app?.inflated?.logConfigMap).filter(serviceName => app?.inflated?.logConfigMap[serviceName].replaceConsoleTransport) : [];
+      const serviceNamesWithLogConfigReplaceFile = app?.inflated ?
+        Object.keys(app?.inflated?.logConfigMap).filter(serviceName => app?.inflated?.logConfigMap[serviceName].replaceFileTransport) : [];
+      // console.dir(level);
+      
+      // console.dir(app?.inflated?.logConfigMap["m-admin"])
+      // console.dir(serviceNamesWithLogConfigReplaceConsole.length);
+      // console.dir(serviceNamesWithLogConfigReplaceFile.length);
       await Promise.allSettled((level === undefined ?
         [
           level === undefined && serviceNamesWithLogConfigReplaceConsole.length === 0 && defaultConsole ?
             defaultConsole.write(args) : Promise.resolve(),
           level === undefined && serviceNamesWithLogConfigReplaceFile.length === 0 && defaultFile ?
             defaultFile.write(args) : Promise.resolve()
-        ] : []).concat(app.inflated ?
-          Object.keys(app.inflated.logConfigMap).map(serviceName => app.inflated.logConfigMap[serviceName]).filter(c => c.level === level).map(c => c.write(args)) : []
+        ] : []).concat(app && app.inflated && app?.inflated ?
+          Object.keys(app?.inflated?.logConfigMap).map(serviceName => app?.inflated?.logConfigMap[serviceName]).filter(c => c.level === level).map(c => c.write(args)) : []
         ));
     } catch (e) {
       console.error(e);
     }
   }
   return {
-    name: app.options.name,
+    name: app?.options?.name,
     formatter: (args: WriteArgs) => {
       const params: string[] = args.optionalParams;
       return format(
-        `${new Date().toISOString()} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? (args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] `) : ""}${args.message}`,
+        `${new Date().toLocaleDateString(undefined, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+          hour12: false
+        })} ${new Date().toLocaleTimeString(undefined, app?.options?.dateTimeFormatOptions ? app?.options?.dateTimeFormatOptions : {
+          hour12: false
+        })} PID[${process.pid}] ${args.identifier ? `[${args.identifier}] ` : ""}${args.level !== "info" ? (args.level === "error" || args.level === "warn" ? `[${args.level.toUpperCase()}] ` : `[${args.level}] `) : ""}${args.message}`,
         ...params)
     },
     transports: [
@@ -51,31 +75,7 @@ export function createLogProviderOptions(app: Miqro) {
             await defaultWrite(args, undefined);
           }
         }
-      })), {
-        level: "trace" as LogLevel,
-        write: async (args) => {
-          try {
-            if (app.options.editor) {
-              try {
-                const ws = app.webSocketManager.getWS(LOG_SOCKET_PATH);
-                if (ws) {
-                  //console.log("\n\n" + process.pid + " broadcasting " + LOG_SOCKET_PATH + "\n\n\n")
-                  await ws.broadcast(JSON.stringify({
-                    type: LOG_WRITE_EVENT,
-                    level: args.level,
-                    identifier: args.identifier,
-                    out: args.out
-                  }));
-                }
-              } catch (e) {
-                console.error(e);
-              }
-            }
-          } catch (e) {
-            console.error(e);
-          }
-        }
-      }],
-    ...(app.options.logProviderOptions ? app.options.logProviderOptions : {})
+      }))],
+    ...(app?.options?.logProviderOptions ? app?.options?.logProviderOptions : {})
   };
 }