miqro 7.0.9 → 7.1.0

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";
@@ -38,10 +38,13 @@ export async function inflateAppForSea(logger, inflateDir, services, port) {
     inflateSeaAssets(logger, inflateDir);
     writeFile(logger, resolve(inflateDir, "sea", "lib.cjs"), Buffer.from(getAsset("lib.cjs")));
     const WSLIST = services.filter(service => getWSConfigPath(resolve(cwd(), service))).map(service => {
-        return `(await require("../${service}/ws.cjs")).default`;
+        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`;
+        return `(await require("./../${service}/server.cjs")).default`;
     }).join(",\n");
     const DBCONFIGLIST = services.filter(service => getDBConfigPath(resolve(cwd(), service))).map(service => {
         return `new Promise(async (resolve, reject) => {
@@ -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;
@@ -120,20 +141,20 @@ main().catch(e=>console.error(e));
 export async function inflateServiceForSea(logger, inflateDir, service, servicePath /*, serviceMigrations: string[]*/, serviceRouteFileMap, serviceStaticFileMap) {
     const migrationsFolderPath = getMigrationsPath(servicePath);
     const serviceMigrations = migrationsFolderPath ? migration.getSortedMigrations(migrationsFolderPath) : [];
-    writeFile(logger, join(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./../lib.cjs");\n
+    writeFile(logger, join(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./${relative(service, "")}/lib.cjs");\n
 async function setupRouter() {
   const router = new Router();
 ${getErrorConfigPath(servicePath) ? `
-  const errorConfig = (await require("../../${service}/catch.cjs")).default;
+  const errorConfig = (await require("../${relative(service, "")}/${service}/catch.cjs")).default;
   if(errorConfig && errorConfig.catch) {
     for(const m of errorConfig.catch) {
       router.catch(m);
     }
   }` : ""}
-${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../../${service}/cors.cjs")).default));` : ""}
-${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../../${service}/auth.cjs")).default));` : ""}
+${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../${relative(service, "")}/${service}/cors.cjs")).default));` : ""}
+${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../${relative(service, "")}/${service}/auth.cjs")).default));` : ""}
 ${getMiddlewareConfigPath(servicePath) ? `
-  const middlewareConfig = (await require("../../${service}/middleware.cjs")).default;
+  const middlewareConfig = (await require("../${relative(service, "")}/${service}/middleware.cjs")).default;
   if(middlewareConfig && middlewareConfig.middleware) {
     for(const m of middlewareConfig.middleware) {
       router.use(m);
@@ -146,8 +167,8 @@ ${Object.keys(serviceRouteFileMap)
         const rPath = join(relative(cwd(), dirname(data.filePath)), basename(data.filePath));
         if (rPath) {
             const rPathExt = extname(rPath);
-            const apiInflatedPath = join("..", "..", rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
-            return `  await appendAPIModule(router, "../../${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
+            const apiInflatedPath = join("..", relative(service, ""), rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
+            return `  await appendAPIModule(router, "../${relative(service, "")}/${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
         }
         else {
             return "";
@@ -168,23 +189,23 @@ ${getMiddlewareConfigPath(servicePath) ? `
 module.exports = {
   setupRouter
 }`);
-    writeFile(logger, join(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./../lib.cjs");\n
+    writeFile(logger, join(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./${relative(service, "")}/lib.cjs");\n
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map(file => {
         const name = `${file.substring(0, file.length - extname(file).length)}`;
-        return `  await migration.up.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+        return `  await migration.up.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
     }).join("\n")}
 }
 module.exports = {
   runMigrations
 }`);
-    writeFile(logger, join(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./../lib.cjs");\n
+    writeFile(logger, join(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./${relative(service, "")}/lib.cjs");\n
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map(file => {
         const name = `${file.substring(0, file.length - extname(file).length)}`;
-        return `  await migration.down.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+        return `  await migration.down.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
     }).join("\n")}
 }
 module.exports = {
@@ -194,7 +215,7 @@ module.exports = {
     /*if (staticFiles.length !== 0) {
       writeFile(logger, join(inflateDir, "sea", service, "static.base64.json"), JSON.stringify(serviceStaticFileMap));
     }*/
-    writeFile(logger, join(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./../lib.cjs");\n
+    writeFile(logger, join(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./${relative(service, "")}/lib.cjs");\n
 async function setupRouter() {
   const router = new Router();
   ${staticFiles.length === 0 ? "" : `

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,
@@ -13051,10 +13052,13 @@ async function inflateAppForSea(logger, inflateDir, services, port) {
   inflateSeaAssets(logger, inflateDir);
   writeFile2(logger, (0, import_node_path14.resolve)(inflateDir, "sea", "lib.cjs"), Buffer.from(getAsset("lib.cjs")));
   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`;
+    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`;
+    return `(await require("./../${service}/server.cjs")).default`;
   }).join(",\n");
   const DBCONFIGLIST = services.filter((service) => getDBConfigPath((0, import_node_path14.resolve)((0, import_node_process10.cwd)(), service))).map((service) => {
     return `new Promise(async (resolve, reject) => {
@@ -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;
@@ -13143,21 +13165,21 @@ main().catch(e=>console.error(e));
 async function inflateServiceForSea(logger, inflateDir, service, servicePath, serviceRouteFileMap, serviceStaticFileMap) {
   const migrationsFolderPath = getMigrationsPath(servicePath);
   const serviceMigrations = migrationsFolderPath ? lib_exports2.getSortedMigrations(migrationsFolderPath) : [];
-  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./../lib.cjs");
+  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./${(0, import_node_path14.relative)(service, "")}/lib.cjs");
 
 async function setupRouter() {
   const router = new Router();
 ${getErrorConfigPath(servicePath) ? `
-  const errorConfig = (await require("../../${service}/catch.cjs")).default;
+  const errorConfig = (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/catch.cjs")).default;
   if(errorConfig && errorConfig.catch) {
     for(const m of errorConfig.catch) {
       router.catch(m);
     }
   }` : ""}
-${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../../${service}/cors.cjs")).default));` : ""}
-${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../../${service}/auth.cjs")).default));` : ""}
+${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../${(0, import_node_path14.relative)(service, "")}/${service}/cors.cjs")).default));` : ""}
+${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../${(0, import_node_path14.relative)(service, "")}/${service}/auth.cjs")).default));` : ""}
 ${getMiddlewareConfigPath(servicePath) ? `
-  const middlewareConfig = (await require("../../${service}/middleware.cjs")).default;
+  const middlewareConfig = (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/middleware.cjs")).default;
   if(middlewareConfig && middlewareConfig.middleware) {
     for(const m of middlewareConfig.middleware) {
       router.use(m);
@@ -13167,8 +13189,8 @@ ${Object.keys(serviceRouteFileMap).map((filePath) => serviceRouteFileMap[filePat
     const rPath = (0, import_node_path14.join)((0, import_node_path14.relative)((0, import_node_process10.cwd)(), (0, import_node_path14.dirname)(data.filePath)), (0, import_node_path14.basename)(data.filePath));
     if (rPath) {
       const rPathExt = (0, import_node_path14.extname)(rPath);
-      const apiInflatedPath = (0, import_node_path14.join)("..", "..", rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
-      return `  await appendAPIModule(router, "../../${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
+      const apiInflatedPath = (0, import_node_path14.join)("..", (0, import_node_path14.relative)(service, ""), rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
+      return `  await appendAPIModule(router, "../${(0, import_node_path14.relative)(service, "")}/${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
     } else {
       return "";
     }
@@ -13187,32 +13209,32 @@ ${getMiddlewareConfigPath(servicePath) ? `
 module.exports = {
   setupRouter
 }`);
-  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./../lib.cjs");
+  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./${(0, import_node_path14.relative)(service, "")}/lib.cjs");
 
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map((file) => {
     const name = `${file.substring(0, file.length - (0, import_node_path14.extname)(file).length)}`;
-    return `  await migration.up.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.up.module(db, "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
   runMigrations
 }`);
-  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./../lib.cjs");
+  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./${(0, import_node_path14.relative)(service, "")}/lib.cjs");
 
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map((file) => {
     const name = `${file.substring(0, file.length - (0, import_node_path14.extname)(file).length)}`;
-    return `  await migration.down.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.down.module(db, "${file}", (await require("../${(0, import_node_path14.relative)(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
   runMigrations
 }`);
   const staticFiles = Object.keys(serviceStaticFileMap);
-  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./../lib.cjs");
+  writeFile2(logger, (0, import_node_path14.join)(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./${(0, import_node_path14.relative)(service, "")}/lib.cjs");
 
 async function setupRouter() {
   const router = new Router();
@@ -14366,6 +14388,13 @@ function checkSigCryptoKey(key, alg, usage2) {
         throw unusable("Ed25519");
       break;
     }
+    case "ML-DSA-44":
+    case "ML-DSA-65":
+    case "ML-DSA-87": {
+      if (!isAlgorithm(key.algorithm, alg))
+        throw unusable(alg);
+      break;
+    }
     case "ES256":
     case "ES384":
     case "ES512": {
@@ -14659,33 +14688,41 @@ var digest_default = async (algorithm, data) => {
 function lengthAndInput(input) {
   return concat(uint32be(input.length), input);
 }
-async function concatKdf(secret, bits, value) {
-  const iterations = Math.ceil((bits >> 3) / 32);
-  const res = new Uint8Array(iterations * 32);
-  for (let iter = 0; iter < iterations; iter++) {
-    const buf = new Uint8Array(4 + secret.length + value.length);
-    buf.set(uint32be(iter + 1));
-    buf.set(secret, 4);
-    buf.set(value, 4 + secret.length);
-    res.set(await digest_default("sha256", buf), iter * 32);
-  }
-  return res.slice(0, bits >> 3);
+async function concatKdf(Z, L, OtherInfo) {
+  const dkLen = L >> 3;
+  const hashLen = 32;
+  const reps = Math.ceil(dkLen / hashLen);
+  const dk = new Uint8Array(reps * hashLen);
+  for (let i = 1; i <= reps; i++) {
+    const hashInput = new Uint8Array(4 + Z.length + OtherInfo.length);
+    hashInput.set(uint32be(i), 0);
+    hashInput.set(Z, 4);
+    hashInput.set(OtherInfo, 4 + Z.length);
+    const hashResult = await digest_default("sha256", hashInput);
+    dk.set(hashResult, (i - 1) * hashLen);
+  }
+  return dk.slice(0, dkLen);
 }
 async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu = new Uint8Array(0), apv = new Uint8Array(0)) {
   checkEncCryptoKey(publicKey, "ECDH");
   checkEncCryptoKey(privateKey, "ECDH", "deriveBits");
-  const value = concat(lengthAndInput(encoder.encode(algorithm)), lengthAndInput(apu), lengthAndInput(apv), uint32be(keyLength));
-  let length;
-  if (publicKey.algorithm.name === "X25519") {
-    length = 256;
-  } else {
-    length = Math.ceil(parseInt(publicKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3;
-  }
-  const sharedSecret = new Uint8Array(await crypto.subtle.deriveBits({
+  const algorithmID = lengthAndInput(encoder.encode(algorithm));
+  const partyUInfo = lengthAndInput(apu);
+  const partyVInfo = lengthAndInput(apv);
+  const suppPubInfo = uint32be(keyLength);
+  const suppPrivInfo = new Uint8Array(0);
+  const otherInfo = concat(algorithmID, partyUInfo, partyVInfo, suppPubInfo, suppPrivInfo);
+  const Z = new Uint8Array(await crypto.subtle.deriveBits({
     name: publicKey.algorithm.name,
     public: publicKey
-  }, privateKey, length));
-  return concatKdf(sharedSecret, keyLength, value);
+  }, privateKey, getEcdhBitLength(publicKey)));
+  return concatKdf(Z, keyLength, otherInfo);
+}
+function getEcdhBitLength(publicKey) {
+  if (publicKey.algorithm.name === "X25519") {
+    return 256;
+  }
+  return Math.ceil(parseInt(publicKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3;
 }
 function allowed(key) {
   switch (key.algorithm.namedCurve) {
@@ -14790,6 +14827,19 @@ function subtleMapping(jwk) {
   let algorithm;
   let keyUsages;
   switch (jwk.kty) {
+    case "AKP": {
+      switch (jwk.alg) {
+        case "ML-DSA-44":
+        case "ML-DSA-65":
+        case "ML-DSA-87":
+          algorithm = { name: jwk.alg };
+          keyUsages = jwk.priv ? ["sign"] : ["verify"];
+          break;
+        default:
+          throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+      }
+      break;
+    }
     case "RSA": {
       switch (jwk.alg) {
         case "PS256":
@@ -14875,9 +14925,11 @@ var jwk_to_key_default = async (jwk) => {
   }
   const { algorithm, keyUsages } = subtleMapping(jwk);
   const keyData = { ...jwk };
-  delete keyData.alg;
+  if (keyData.kty !== "AKP") {
+    delete keyData.alg;
+  }
   delete keyData.use;
-  return crypto.subtle.importKey("jwk", keyData, algorithm, jwk.ext ?? (jwk.d ? false : true), jwk.key_ops ?? keyUsages);
+  return crypto.subtle.importKey("jwk", keyData, algorithm, jwk.ext ?? (jwk.d || jwk.priv ? false : true), jwk.key_ops ?? keyUsages);
 };
 
 // node_modules/jose/dist/webapi/key/import.js
@@ -14898,6 +14950,16 @@ async function importJWK(jwk, alg, options) {
       if ("oth" in jwk && jwk.oth !== void 0) {
         throw new JOSENotSupported('RSA JWK "oth" (Other Primes Info) Parameter value is not supported');
       }
+      return jwk_to_key_default({ ...jwk, alg, ext });
+    case "AKP": {
+      if (typeof jwk.alg !== "string" || !jwk.alg) {
+        throw new TypeError('missing "alg" (Algorithm) Parameter value');
+      }
+      if (alg !== void 0 && alg !== jwk.alg) {
+        throw new TypeError("JWK alg and alg option value mismatch");
+      }
+      return jwk_to_key_default({ ...jwk, ext });
+    }
     case "EC":
     case "OKP":
       return jwk_to_key_default({ ...jwk, alg, ext });
@@ -15147,10 +15209,10 @@ function isJWK(key) {
   return is_object_default(key) && typeof key.kty === "string";
 }
 function isPrivateJWK(key) {
-  return key.kty !== "oct" && typeof key.d === "string";
+  return key.kty !== "oct" && (key.kty === "AKP" && typeof key.priv === "string" || typeof key.d === "string");
 }
 function isPublicJWK(key) {
-  return key.kty !== "oct" && typeof key.d === "undefined";
+  return key.kty !== "oct" && typeof key.d === "undefined" && typeof key.priv === "undefined";
 }
 function isSecretJWK(key) {
   return key.kty === "oct" && typeof key.k === "string";
@@ -15203,6 +15265,18 @@ var handleKeyObject = (keyObject, alg) => {
       isPublic ? "verify" : "sign"
     ]);
   }
+  switch (keyObject.asymmetricKeyType) {
+    case "ml-dsa-44":
+    case "ml-dsa-65":
+    case "ml-dsa-87": {
+      if (alg !== keyObject.asymmetricKeyType.toUpperCase()) {
+        throw new TypeError("given KeyObject instance cannot be used for this algorithm");
+      }
+      cryptoKey = keyObject.toCryptoKey(keyObject.asymmetricKeyType, extractable, [
+        isPublic ? "verify" : "sign"
+      ]);
+    }
+  }
   if (keyObject.asymmetricKeyType === "rsa") {
     let hash;
     switch (alg) {
@@ -15630,6 +15704,10 @@ async function keyToJWK(key) {
     throw new TypeError("non-extractable CryptoKey cannot be exported as a JWK");
   }
   const { ext, key_ops, alg, use, ...jwk } = await crypto.subtle.exportKey("jwk", key);
+  if (jwk.kty === "AKP") {
+    ;
+    jwk.alg = alg;
+  }
   return jwk;
 }
 
@@ -15895,6 +15973,10 @@ var subtle_dsa_default = (alg, algorithm) => {
     case "Ed25519":
     case "EdDSA":
       return { name: "Ed25519" };
+    case "ML-DSA-44":
+    case "ML-DSA-65":
+    case "ML-DSA-87":
+      return { name: alg };
     default:
       throw new JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);
   }
@@ -16850,30 +16932,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 +16974,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 +17043,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 +17514,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 +17577,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.1.0",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -50,8 +50,8 @@
     "@miqro/runner": "^2.0.1",
     "@miqro/test": "^0.2.9",
     "@miqro/test-http": "^0.1.2",
-    "esbuild": "0.25.6",
-    "jose": "6.0.11",
+    "esbuild": "0.25.9  ",
+    "jose": "6.1.0",
     "showdown": "2.1.0"
   }
 }

package/sea/install-esbuild.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/esbuild"
-VERSION="0.25.6"
+VERSION="0.25.9"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/install-nodejs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/nodejs"
-VERSION="24.4.0"
+VERSION="24.7.0"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/node.version.tag

@@ -1 +1 @@
-24.4.0
+24.7.0

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";
@@ -47,11 +47,15 @@ export async function inflateAppForSea(logger: Logger, inflateDir: string, servi
   writeFile(logger, resolve(inflateDir, "sea", "lib.cjs"), Buffer.from(getAsset("lib.cjs")));
 
   const WSLIST = services.filter(service => getWSConfigPath(resolve(cwd(), service))).map(service => {
-    return `(await require("../${service}/ws.cjs")).default`;
-  }).join(",")
+    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`;
+    return `(await require("./../${service}/server.cjs")).default`;
   }).join(",\n");
 
   const DBCONFIGLIST = services.filter(service => getDBConfigPath(resolve(cwd(), service))).map(service => {
@@ -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;
@@ -137,20 +159,20 @@ export async function inflateServiceForSea(logger: Logger, inflateDir: string, s
   const migrationsFolderPath = getMigrationsPath(servicePath);
 
   const serviceMigrations: string[] = migrationsFolderPath ? migration.getSortedMigrations(migrationsFolderPath) : [];
-  writeFile(logger, join(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./../lib.cjs");\n
+  writeFile(logger, join(inflateDir, "sea", service, "router.cjs"), `const { appendAPIModule, Router, middleware } = require("./${relative(service, "")}/lib.cjs");\n
 async function setupRouter() {
   const router = new Router();
 ${getErrorConfigPath(servicePath) ? `
-  const errorConfig = (await require("../../${service}/catch.cjs")).default;
+  const errorConfig = (await require("../${relative(service, "")}/${service}/catch.cjs")).default;
   if(errorConfig && errorConfig.catch) {
     for(const m of errorConfig.catch) {
       router.catch(m);
     }
   }` : ""}
-${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../../${service}/cors.cjs")).default));` : ""}
-${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../../${service}/auth.cjs")).default));` : ""}
+${getCORSConfigPath(servicePath) ? `  router.use(middleware.cors((await require("../${relative(service, "")}/${service}/cors.cjs")).default));` : ""}
+${getAuthConfigPath(servicePath) ? `  router.use(middleware.session((await require("../${relative(service, "")}/${service}/auth.cjs")).default));` : ""}
 ${getMiddlewareConfigPath(servicePath) ? `
-  const middlewareConfig = (await require("../../${service}/middleware.cjs")).default;
+  const middlewareConfig = (await require("../${relative(service, "")}/${service}/middleware.cjs")).default;
   if(middlewareConfig && middlewareConfig.middleware) {
     for(const m of middlewareConfig.middleware) {
       router.use(m);
@@ -163,8 +185,8 @@ ${Object.keys(serviceRouteFileMap)
         const rPath = join(relative(cwd(), dirname(data.filePath)), basename(data.filePath));
         if (rPath) {
           const rPathExt = extname(rPath);
-          const apiInflatedPath = join("..", "..", rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
-          return `  await appendAPIModule(router, "../../${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
+          const apiInflatedPath = join("..", relative(service, ""), rPath.substring(0, rPath.length - rPathExt.length) + ".cjs");
+          return `  await appendAPIModule(router, "../${relative(service, "")}/${service}/http", "./${apiInflatedPath}", (await require("./${apiInflatedPath}")).default);`;
         } else {
           return "";
         }
@@ -185,24 +207,24 @@ module.exports = {
   setupRouter
 }`);
 
-  writeFile(logger, join(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./../lib.cjs");\n
+  writeFile(logger, join(inflateDir, "sea", service, "migration-up.cjs"), `const { migration } = require("./${relative(service, "")}/lib.cjs");\n
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map(file => {
     const name = `${file.substring(0, file.length - extname(file).length)}`;
-    return `  await migration.up.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.up.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
   runMigrations
 }`);
 
-  writeFile(logger, join(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./../lib.cjs");\n
+  writeFile(logger, join(inflateDir, "sea", service, "migration-down.cjs"), `const { migration } = require("./${relative(service, "")}/lib.cjs");\n
 async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map(file => {
     const name = `${file.substring(0, file.length - extname(file).length)}`;
-    return `  await migration.down.module(db, "${file}", (await require("../../${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.down.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
@@ -213,7 +235,7 @@ module.exports = {
   /*if (staticFiles.length !== 0) {
     writeFile(logger, join(inflateDir, "sea", service, "static.base64.json"), JSON.stringify(serviceStaticFileMap));
   }*/
-  writeFile(logger, join(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./../lib.cjs");\n
+  writeFile(logger, join(inflateDir, "sea", service, "static-router.cjs"), `const { appendAPIModule, Router } = require("./${relative(service, "")}/lib.cjs");\n
 async function setupRouter() {
   const router = new Router();
   ${staticFiles.length === 0 ? "" : `

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 : {})
   };
 }