miqro 7.2.6 → 7.2.8

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

@@ -1,81 +0,0 @@
-import { ConsoleTransport, FileTransport, LoggerTransport, LoggerTransportWriteArgs, LogLevel, WriteArgs } from "@miqro/core";
-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?: {
-  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 && 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 === undefined ?
-        FileTransport() :
-        undefined;
-  const defaultWrite = async (args: LoggerTransportWriteArgs, level?: LogLevel) => {
-    try {
-      // 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 && 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,
-    formatter: (args: WriteArgs) => {
-      const params: string[] = args.optionalParams;
-      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"] as LogLevel[]).map(level => {
-        return level ? {
-          level,
-          write: async (args) => {
-            await defaultWrite(args, level);
-          }
-        } : {
-          write: async (args) => {
-            await defaultWrite(args, undefined);
-          }
-        }
-      }))],
-    ...(app?.options?.logProviderOptions ? app?.options?.logProviderOptions : {})
-  };
-}

package/src/services/utils/log.ts

@@ -1,92 +0,0 @@
-import { ConsoleTransport, getEnvVariable, Logger, LoggerTransport, MinimalLogger, newURL, normalizePath, Request, WriteArgs } from "@miqro/core";
-import { format } from "node:util";
-
-const DEFAULT_ENV_NAME = "LOG_LEVEL";
-
-export interface LogProviderOptions {
-  name?: string;
-  transports: LoggerTransport[];
-  formatter: (args: WriteArgs) => string;
-}
-
-export const DEFAULT_FORMATTER = ({ identifier, level, message, optionalParams }: WriteArgs) => format(`${new Date().toISOString()} PID[${process.pid}] ` +
-  `${identifier ? `[${identifier}] ` : ""}` +
-  `${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
-  `${message}`, ...optionalParams)
-
-export class LogProvider {
-
-  public options: LogProviderOptions;
-  public constructor(options?: LogProviderOptions) {
-    this.options = {
-      formatter: options && options.formatter ? options.formatter : DEFAULT_FORMATTER,
-      transports: options && options.transports ? options.transports : [ConsoleTransport()],
-      name: options?.name
-    };
-    this.requestLoggerFactory = this.requestLoggerFactory.bind(this);
-  }
-
-  public requestLoggerFactory(uuid: string, req: Request): MinimalLogger {
-    let path = "";
-    let query = "";
-    let urlParsingError;
-    let method = "GET";
-    let remoteAddress: string | undefined = "";
-    try {
-      const url = newURL(req.url ? req.url : "/") as URL;
-      query = url.searchParams.toString();
-      path = normalizePath(url.pathname); // normalized path
-      method = req.method ? req.method.toUpperCase() as string : "GET";
-      remoteAddress = req.socket.remoteAddress;
-    } catch (e) {
-      urlParsingError = e;
-    }
-    const pathToEnv = path.replace(/\//ig, "_").replace(/\./ig, "_").replace(/-/ig, "_").toUpperCase();
-    const WORKER_IDENTIFIER = process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_` : "";
-    const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${pathToEnv.charAt(pathToEnv.length - 1) !== "_" ? "_" : ""}${method.toUpperCase()}`;
-    const upgrade = req.headers.connection?.indexOf("Upgrade") !== -1;
-
-    const logger = this.getLogger(
-      `${WORKER_IDENTIFIER}${identifier}`, {
-      formatter: (args: WriteArgs) => {
-        args.message = `%s${upgrade ? " UPGRADE" : ""} %s%s [%s] (%s) ${args.message}`;
-        args.optionalParams = [method, path, query ? `?${query}` : "", uuid, remoteAddress].concat(args.optionalParams);
-        args.meta.push(req);
-        args.meta.push(uuid);
-        return this.options.formatter(args);
-      }
-    });
-
-
-    if (urlParsingError) {
-      logger.error(urlParsingError);
-    }
-
-    return logger;
-  };
-
-  public getLogger(identifier: string, options?: { level?: any; transports?: any[]; formatter?: any; }): Logger {
-
-    identifier = this.options.name ?
-      `${this.options.name}${identifier ?
-        `_${identifier}` : ""}`.toUpperCase() :
-      identifier ? identifier.toUpperCase() : "";
-
-    const envVarName = `LOG_LEVEL_${identifier}`;
-    const level = options && options.level ? options.level : getEnvVariable(envVarName) ? getEnvVariable(envVarName) : getEnvVariable(DEFAULT_ENV_NAME, "info");
-
-    const logger = new Logger(identifier, level, {
-      transports: [],
-      formatter: options && options.formatter ? options.formatter : this.options.formatter
-    });
-    for (const t of this.options.transports) {
-      logger.addTransport(t);
-    }
-    if (options && options.transports) {
-      for (const t of options.transports) {
-        logger.addTransport(t);
-      }
-    }
-    return logger;
-  }
-}

package/src/services/utils/middleware.ts

@@ -1,10 +0,0 @@
-import { CORS, JSONParser, ReadBuffer, SessionHandler, TextParser, URLEncodedParser } from "@miqro/core";
-
-export const middleware = Object.freeze({
-  buffer: ReadBuffer,
-  url: URLEncodedParser,
-  json: JSONParser,
-  text: TextParser,
-  cors: CORS,
-  session: SessionHandler
-});

package/src/services/utils/server-interface.ts

@@ -1,122 +0,0 @@
-import { Logger } from "@miqro/core";
-import cluster from "node:cluster";
-import { CacheInterface, NamedMigration, ServerInterface } from "../../types.js";
-import { DBManager } from "./db-manager.js";
-import { Miqro } from "../app.js";
-import { WebSocketManager } from "./websocketmanager.js";
-import { execSync } from "node:child_process";
-import { LogProvider } from "./log.js";
-import { HTMLEncode } from "../../../editor/common/html-encode.js";
-import { inflateMD2HTML } from "../../inflate/md.js";
-
-import { Parser } from "@miqro/parser";
-import { ClusterCache } from "./cluster-cache.js";
-import { LocalCache } from "./cache.js";
-import { middleware } from "./middleware.js";
-import { jwt } from "./jwt.js";
-
-// import { initGlobals } from "../globals.js";
-
-export interface ServerInterfaceImplOptions {
-  cache: CacheInterface;
-  localCache: CacheInterface;
-  dbManager: DBManager;
-  webSocketManager: WebSocketManager;
-  logger?: Logger;
-  app?: Miqro;
-  port?: string;
-  loggerProvider?: LogProvider;
-}
-
-export function createServerInterface(options: ServerInterfaceImplOptions): ServerInterface {
-  // initGlobals();
-  return Object.freeze<ServerInterface>({
-    middleware,
-    encodeHTML: HTMLEncode,
-    inflateMDtoHTML: inflateMD2HTML,
-    newParser() {
-      return new Parser();
-    },
-    newClusterCache(name, logger) {
-      return new ClusterCache(name, logger);
-    },
-    newLocalCache(name, logger) {
-      return new LocalCache(name, logger);
-    },
-    getWorkerNumber(): number {
-      return cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === undefined ? 0 : parseInt(process.env["CLUSTER_NODE_NUMBER"], 10);
-    },
-    getWorkerCount(): number {
-      return cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === undefined || process.env["CLUSTER_COUNT"] === undefined ? 1 : parseInt(process.env["CLUSTER_COUNT"], 10);
-    },
-    isPrimaryWorker(): boolean {
-      return cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0";
-    },
-    jwt,
-    cache: options.cache,
-    localCache: options.localCache,
-    logger: options.logger,
-    reload() {
-      return options?.app?.reload();
-    },
-    restart() {
-      return options?.app?.restart();
-    },
-    stop() {
-      return options?.app?.stop();
-    },
-    db: {
-      get(name) {
-        return options.dbManager.getDB(name);
-      },
-      getMigrations() {
-        if (options.app?.inflated) {
-          const ret: NamedMigration[] = [];
-          for (const d of options.app?.inflated.dbList) {
-            ret.push(...(d.migrations.map(m => {
-              return {
-                name: m.name,
-                service: m.service,
-                dbName: m.dbName
-              }
-            })));
-          }
-          return ret;
-        }
-        return [];
-      },
-      migrate(migrateOptions) {
-        return options?.app?.migrate(migrateOptions);
-      },
-    },
-    ws: {
-      get: (name: string) => {
-        return options?.webSocketManager?.getWS(name);
-      },
-      disconnectAll: (path: string) => {
-        return options?.webSocketManager?.disconnectAllButLOGSocket();
-      }
-    },
-    openBrowser(path) {
-      const PORT = options.port;
-      const URL = `http://localhost${PORT ? `:${PORT}` : ""}${path}`;
-      const DEFAULT_OPEN = process.platform === "win32" ? "explorer" : process.platform === "darwin" ? "open" : "xdg-open";
-      const OPEN = options?.app?.options.browser !== undefined && String(options?.app?.options.browser).toUpperCase() !== "TRUE" && String(options?.app?.options.browser).toUpperCase() !== "1" ?
-        String(options?.app.options.browser).toUpperCase() !== "0" && String(options?.app?.options.browser).toUpperCase() !== "FALSE" && String(options?.app?.options.browser).toUpperCase() !== "NONE" && options?.app?.options.browser ?
-          options?.app.options.browser : false :
-        process.env["BROWSER"] ?
-          process.env["BROWSER"] === "none" ? false : process.env["BROWSER"] : DEFAULT_OPEN;
-      if (OPEN) {
-        const openCMD = `${OPEN} "${URL}"`;
-        options?.logger?.info("opening browser with [%s]", openCMD);
-        execSync(openCMD);
-      } else {
-        options?.logger?.warn("ignoring browser [%s]", OPEN);
-      }
-    },
-    getLogger(identifier, loggerOptions) {
-      return options?.loggerProvider?.getLogger(identifier, loggerOptions);
-    }
-    // ...server
-  });
-}

package/src/services/utils/websocketmanager.ts

@@ -1,158 +0,0 @@
-import { Logger } from "@miqro/core";
-import { LOG_SOCKET_PATH } from "../../../editor/common/constants.js";
-import { ClusterWebSocketServer2 } from "./cluster-ws.js";
-import { WSConfig } from "../../types.js";
-import { LogProvider } from "./log.js";
-
-export interface WebSocketManagerOptions {
-  logger?: Logger | Console;
-  loggerProvider?: LogProvider;
-  name?: string;
-  avoidLogSocket?: boolean;
-}
-
-export class WebSocketManager {
-  public runningGlobalWSMap = new Map<string, ClusterWebSocketServer2>();
-  public logger?: Logger | Console | null = null;
-  public name: string;
-  public avoidLogSocket: boolean;
-  public loggerProvider: LogProvider;
-  constructor(options?: WebSocketManagerOptions) {
-    this.onUpgrade = this.onUpgrade.bind(this);
-    this.logger = options && options.logger ? options.logger : null;
-    this.name = options && options.name ? options.name : "WebSocketManager";
-    this.loggerProvider = options && options.loggerProvider;
-    this.avoidLogSocket = options && options.avoidLogSocket ? options.avoidLogSocket : false;
-  }
-
-  public deleteWS(path: string) {
-    const ws = this.runningGlobalWSMap.get(path);
-    this.disconnectAllFrom(path);
-    if (ws)
-      ws.dispose();
-    this.runningGlobalWSMap.delete(path);
-  }
-
-  public deleteAllWS() {
-    for (const path of this.runningGlobalWSMap.keys()) {
-      this.deleteWS(path);
-    }
-  }
-
-  public getWS(path: string): ClusterWebSocketServer2 | undefined {
-    return this.runningGlobalWSMap.get(path);
-  }
-
-  public replaceALLWS(list: WSConfig[]) {
-    this.deleteAllWS();
-    for (const wsConfig of list) {
-      if (!wsConfig.disabled) {
-        if (this.runningGlobalWSMap.has(wsConfig.path)) {
-          throw new Error(`ws on path ${wsConfig.path} already setup!`);
-        }
-        this.logger?.debug("setting up websocket on [%s]", wsConfig.path);
-        const identifier = wsConfig.path.replaceAll("/", "_").toUpperCase();
-        const logger = this.loggerProvider && identifier.length >= 0 ? this.loggerProvider.getLogger(identifier.substring(identifier.charAt(0) === "_" ? 1 : 0)) : this.logger;
-        const server = new ClusterWebSocketServer2(this.name + wsConfig.path, wsConfig.path, logger, wsConfig);
-        this.runningGlobalWSMap.set(wsConfig.path, server);
-      }
-    }
-  }
-
-  public replaceALLWSBuLOGSocket(list: WSConfig[]) {
-    for (const path of this.runningGlobalWSMap.keys()) {
-      if (path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-        this.deleteWS(path);
-      }
-    }
-    for (const wsConfig of list) {
-      if (!wsConfig.disabled) {
-        if (wsConfig.path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-          if (this.runningGlobalWSMap.has(wsConfig.path)) {
-            throw new Error(`ws on path ${wsConfig.path} already setup!`);
-          }
-          this.logger?.debug("setting up websocket on [%s]", wsConfig.path);
-          const identifier = wsConfig.path.replaceAll("/", "_").toUpperCase();
-          const logger = this.loggerProvider && identifier.length >= 0 ? this.loggerProvider.getLogger(identifier.substring(identifier.charAt(0) === "_" ? 1 : 0)) : this.logger;
-          const server = new ClusterWebSocketServer2(this.name + wsConfig.path, wsConfig.path, logger, wsConfig);
-          this.runningGlobalWSMap.set(wsConfig.path, server);
-        }
-      }
-    }
-  }
-
-  /*public setupWS(path: string, server: ClusterWebSocketServer2) {
-    if (this.runningGlobalWSMap.has(path)) {
-      throw new Error(`ws on path ${path} already setup!`);
-    }
-    this.runningGlobalWSMap.set(path, server);
-  }*/
-
-  public disconnectAllFrom(path: string) {
-    try {
-      this.logger?.debug("disconnect all from [%s]", path);
-      const ws = this.getWS(path);
-      if (ws) {
-        const clients = ws.clients.values();
-        if (clients) {
-          for (const client of clients) {
-            try {
-              client.socket.destroy();
-            } catch (e2) {
-              this.logger?.error("error disconnecting web socket client");
-              this.logger?.error(e2);
-            }
-          }
-        }
-        //ws.dispose();
-      }
-    } catch (e) {
-      this.logger?.error("error disconnecting web socket clients");
-      this.logger?.error(e.message);
-    }
-  }
-
-  public disconnectAllButLOGSocket() {
-    try {
-      for (const wsPath of this.runningGlobalWSMap.keys()) {
-        if (wsPath !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-          this.disconnectAllFrom(wsPath);
-        }
-      }
-    } catch (e) {
-      this.logger?.error("error disconnecting web socket clients");
-      this.logger?.error(e.message);
-    }
-  }
-
-  public disconnectAll() {
-    try {
-      for (const wsPath of this.runningGlobalWSMap.keys()) {
-        this.disconnectAllFrom(wsPath);
-      }
-    } catch (e) {
-      this.logger?.error("error disconnecting web socket clients");
-      this.logger?.error(e.message);
-    }
-  }
-
-  public onUpgrade(req, socket, head) {
-    try {
-      const wsServer = this.getWS(req.path);
-      if (wsServer) {
-        return wsServer.onUpgrade(req, socket, head);
-      } else {
-        socket.destroy();
-      }
-    } catch (e) {
-      this.logger?.error(e);
-    }
-  }
-}
-
-/*export interface WSMapConfig {
-  [path: string]: {
-    name: string;
-    options: WSConfig;
-  } | undefined;
-}*/