miqro 6.0.9 → 6.0.11

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

@@ -0,0 +1,75 @@
+import { ConsoleTransport, FileTransport, 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";
+
+export function createLogProviderOptions(app: Miqro) {
+  const defaultConsole = ConsoleTransport();
+  const defaultFile = FileTransport();
+  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) : [];
+      await Promise.allSettled((level === undefined ?
+        [
+          level === undefined && serviceNamesWithLogConfigReplaceConsole.length === 0 ?
+            defaultConsole.write(args) : Promise.resolve(),
+          level === undefined && serviceNamesWithLogConfigReplaceFile.length === 0 ?
+            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)) : []
+        ));
+    } catch (e) {
+      console.error(e);
+    }
+  }
+  return {
+    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}`,
+        ...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);
+          }
+        }
+      })), {
+        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 : {})
+  };
+}

package/src/services/utils/websocketmanager.ts

@@ -20,8 +20,18 @@ export class WebSocketManager {
     this.name = options && options.name ? options.name : "WebSocketManager";
     this.avoidLogSocket = options && options.avoidLogSocket ? options.avoidLogSocket : false;
   }
+
+  public deleteWS(path: string) {
+    const ws = this.runningGlobalWSMap.get(path);
+    this.disconnectAllFrom(path);
+    ws.dispose();
+    this.runningGlobalWSMap.delete(path);
+  }
+
   public deleteAllWS() {
-    this.runningGlobalWSMap.clear();
+    for (const path of this.runningGlobalWSMap.keys()) {
+      this.deleteWS(path);
+    }
   }
 
   public getWS(path: string): ClusterWebSocketServer2 | undefined {
@@ -45,7 +55,7 @@ export class WebSocketManager {
   public replaceALLWSBuLOGSocket(list: WSConfig[]) {
     for (const path of this.runningGlobalWSMap.keys()) {
       if (path !== LOG_SOCKET_PATH || !this.avoidLogSocket) {
-        this.runningGlobalWSMap.delete(path);
+        this.deleteWS(path);
       }
     }
     for (const wsConfig of list) {
@@ -85,7 +95,7 @@ export class WebSocketManager {
             }
           }
         }
-        ws.dispose();
+        //ws.dispose();
       }
     } catch (e) {
       this.logger?.error("error disconnecting web socket clients");

package/src/types/miqro.d.ts

@@ -105,5 +105,5 @@ export interface ServerRequest extends Request {
 export interface ServerResponse extends Response {
 }
 
-export { App, LoggerHandler, Router } from "@miqro/core/lib.js";
-export { migration } from "@miqro/query/lib.js";
+export { App, LoggerHandler, Router, APIRoute } from "@miqro/core/lib.js";
+export { migration, Migration } from "@miqro/query/lib.js";

package/src/types.ts

@@ -41,6 +41,9 @@ declare global {
   }
 }
 
+export { APIRoute } from "@miqro/core";
+export { Migration } from "@miqro/query";
+
 export interface ServerGlobal {
   encodeHTML: (str: string) => string;
   inflateMDtoHTML: (str: string) => string;

package/package.json--OLD

@@ -1,36 +0,0 @@
-{
-  "name": "miqro",
-  "version": "5.0.5",
-  "description": "",
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "type": "module",
-  "bin": {
-    "miqro": "build/cli.js"
-  },
-  "scripts": {
-    "prepare2": "npm run build",
-    "prebuild": "rm -Rf build;",
-    "build": "tsc",
-    "pretest": "npm run build",
-    "test": "node --enable-source-maps --test test/**.test.js",
-    "coverage": "node --enable-source-maps --experimental-test-coverage --test test/**.test.js"
-  },
-  "author": "claukers",
-  "license": "ISC",
-  "dependencies": {
-    "@miqro/core": "^5.0.12",
-    "@miqro/query": "^0.0.3",
-    "@miqro/parser": "^2.0.4",
-    "@miqro/runner": "^2.0.1"
-  },
-  "devDependencies": {
-    "@types/cookie": "0.6.0",
-    "@types/node": "^20.4.5",
-    "typescript": "5.3.3"
-  },
-  "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=6.0.0"
-  }
-}