miqro 6.0.9 → 6.0.10

package/src/services/app.ts

@@ -1,5 +1,5 @@
 import cluster from "node:cluster";
-import { App, Router, Logger, LoggerHandler, ConsoleTransport, FileTransport, LogLevel, LoggerTransportWriteArgs } from "@miqro/core";
+import { App, Router, Logger, LoggerHandler } 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, LOG_WRITE_EVENT } from "../../editor/common/constants.js";
+import { BASEEDITOR_PATH, LOG_SOCKET_PATH } from "../../editor/common/constants.js";
 import editorWSConfig from "../../editor/ws.js";
 import editorServerConfig from "../../editor/server.js";
 
@@ -19,16 +19,16 @@ import { watchAndServer } from "../common/watch.js";
 import { LocalCache } from "./utils/cache.js";
 import { initGlobals } from "./globals.js";
 import { EditorAdminInterface } from "../../editor/common/admin-interface.js";
-import { getHotReloadScript } from "./hot-reload.js";
 import { LogProvider, LogProviderOptions } from "./utils/log.js";
 import { initAssets } from "../common/assets.js";
 import { setupExitHandlers } from "../common/exit.js";
 import { inflateDBConfig, inflateDBMigrations, MigrationModule } from "../inflate/setup-db.js";
 import { getServicePath } from "../common/paths.js";
 import { LogConfigMap } from "../inflate/setup-log.js";
-import { format } from "node:util";
 import { ServerInterfaceImpl } from "./utils/server-interface.js";
 import { getPORT } from "../common/arguments.js";
+import { createLogProviderOptions } from "./utils/log-transport.js";
+import { createAdminInterface } from "./utils/admin-interface.js";
 
 export interface MiqroOptions {
   name: string;
@@ -69,6 +69,7 @@ export interface MiqroClusterMessage {
 }
 
 export class Miqro {
+  public status: "stopped" | "starting" | "stopping" | "reloading" | "started" = "stopped";
   public options: MiqroOptions;
   public server?: App | null = null;
   public cache: ClusterCache;
@@ -85,6 +86,7 @@ export class Miqro {
   public logger?: Logger;
   public loggerProvider: LogProvider;
   public static initAssetsPromise: Promise<any> | null = null;
+  public watcher?: { stopWatch: () => void; };
 
   constructor(options?: Partial<MiqroOptions>) {
     this.options = {
@@ -94,72 +96,7 @@ export class Miqro {
       services: [],
       ...(options ? options : {})
     };
-    const defaultConsole = ConsoleTransport();
-    const defaultFile = FileTransport();
-    const defaultWrite = async (args: LoggerTransportWriteArgs, level?: LogLevel) => {
-      try {
-        const serviceNamesWithLogConfigReplaceConsole = level === undefined && this.inflated ?
-          Object.keys(this.inflated.logConfigMap).filter(serviceName => this.inflated.logConfigMap[serviceName].replaceConsoleTransport) : [];
-        const serviceNamesWithLogConfigReplaceFile = level === undefined && this.inflated ?
-          Object.keys(this.inflated.logConfigMap).filter(serviceName => this.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(this.inflated ?
-            Object.keys(this.inflated.logConfigMap).map(serviceName => this.inflated.logConfigMap[serviceName]).filter(c => c.level === level).map(c => c.write(args)) : []
-          ));
-      } catch (e) {
-        console.error(e);
-      }
-    }
-    this.loggerProvider = new LogProvider({
-      name: this.options.name,
-      formatter: ({ identifier, level, message, optionalParams }) => format(`${new Date().toISOString()} PID[${process.pid}] ` +
-        `${identifier ? `[${identifier}] ` : ""}` +
-        `${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
-        `${message}`, ...optionalParams),
-      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",
-          write: async (args) => {
-            try {
-              if (this.options.editor) {
-                try {
-                  const ws = this.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);
-            }
-          }
-        }],
-      ...(this.options.logProviderOptions ? this.options.logProviderOptions : {})
-    });
+    this.loggerProvider = new LogProvider(createLogProviderOptions(this));
     //if (!this.options.logger) {
     const SERVER_IDENTIFIER = cluster.isPrimary ?
       "" :
@@ -220,59 +157,30 @@ export class Miqro {
       port: this.options.port
     });
     this.serverRequestHandler = ServerRequestHandler(this.serverInterface);
-    const adminCache = new ClusterCache("EditorCache[" + this.options.name + "]");
-
-    this.adminInterface = {
-      getCache: () => adminCache,
-      stop: () => this.stop(),
-      restart: () => this.restart(),
-      reload: () => this.reload(),
-      getHotReloadHTML: getHotReloadScript,
-      getMigrations: () => {
-        if (this.inflated) {
-          const ret: MigrationModule[] = [];
-          for (const db of this.inflated.dbList) {
-            for (const m of db.migrations) {
-              ret.push(m);
-            }
-          }
-          return ret;
-        }
-        return [];
-      },
-      getServices: () => {
-        return this.options.services;
-      },
-      getRouteFileMap: () => {
-        return this.inflated ? this.inflated.fileMap : {};
-      },
-      getInflateErrors: () => {
-        return this.inflated ? this.inflated.errors : [];
-      }/*,
-      inflateJSX: async function inflateJSX(path, minify: boolean = true) {
-        return realInflateJSX(path, {
-          embemedJSX: true,
-          minify,
-          useExport: true
-        });
-      }*/
-    };
+
+    this.adminInterface = createAdminInterface(this);
 
     setupExitHandlers(this);
+  }
 
+  public connect() {
     if (process.send) {
+      process.removeListener("message", this.listener);
       process.on("message", this.listener);
     }
+    this.cache.connect();
+    (this.adminInterface?.getCache() as ClusterCache)?.connect();
   }
 
-  public dispose() {
+  public disconnect() {
     if (this.server !== null) {
       throw new Error("already running! call stop() first");
     }
     if (process.send) {
       process.removeListener("message", this.listener);
     }
-    this.cache.dispose();
+    this.cache.disconnect();
+    (this.adminInterface?.getCache() as ClusterCache)?.disconnect();
     this.webSocketManager.disconnectAll();
     this.dbManager.closeAll();
   }
@@ -482,7 +390,7 @@ export class Miqro {
   }
 
   public async start() {
-    if (this.server !== null) {
+    if (this.server !== null || this.status !== "stopped") {
       throw new Error("cannot start app already running.");
     }
     if (!this.isInflated()) {
@@ -491,7 +399,11 @@ export class Miqro {
     //this.logger?.debug("starting");
     this.logger?.debug("\t\t==start==");
 
+    //this.disconnect();
+    this.status = "starting";
     this.server = undefined;
+    this.connect();
+    await this.dbManager.connectAll();
     this.server = new App({
       onUpgrade: (req: ServerRequest, socket, head) => {
         req.server = this.serverInterface;
@@ -531,20 +443,27 @@ export class Miqro {
     await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "start");
 
     if (this.options.hotreload && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
-      await watchAndServer(this);
+      this.watcher = await watchAndServer(this);
     }
 
     this.logger?.debug("\t\t==start done==");
 
+    this.status = "started";
     return this.inflated.errors && this.inflated.errors.length > 0 ? this.inflated.errors : null;
   }
 
   public async stop() {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot stop server not running");
     }
+    this.status = "stopping";
+    if (this.watcher) {
+      this.watcher.stopWatch();
+      this.watcher = null;
+    }
     const server = this.server;
     this.server = null;
+    this.disconnect();
     this.logger?.debug("\t\t==stop==");
     this.logger?.debug("clear running server routes");
     server.clear();
@@ -555,14 +474,15 @@ export class Miqro {
     //server.ws.disconnectAll();
     this.logger?.debug("stopping");
     const p = server.close();
-    notifiyServerConfigSync(this, "stop");
     await p;
     await pD;
+    this.status = "stopped";
+    notifiyServerConfigSync(this, "stop");
     this.logger?.debug("\t\t==stop done==");
   }
 
   public async restart(avoidSend?: boolean) {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot start server not running");
     }
     this.logger?.debug("\t\t==restart==");
@@ -581,9 +501,10 @@ export class Miqro {
   }
 
   public async reload(avoidSend?: boolean) {
-    if (!this.server || !this.inflated) {
+    if (!this.server || !this.inflated || this.status !== "started") {
       throw new Error("cannot reload server not running");
     }
+    this.status = "reloading";
     /*this.logger?.log("====================");
     this.logger?.log("=======reload=======");
     this.logger?.log("====================");*/
@@ -642,6 +563,7 @@ export class Miqro {
     this.logger?.debug("\t\t==reload done==");
     //this.logger?.log("=====================");
 
+    this.status = "started";
     return this.inflated.errors && this.inflated.errors.length > 0 ? this.inflated.errors : null;
 
   }

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

@@ -0,0 +1,37 @@
+import { EditorAdminInterface } from "../../../editor/common/admin-interface.js";
+import { MigrationModule } from "../../inflate/setup-db.js";
+import { Miqro } from "../app.js";
+import { getHotReloadScript } from "../hot-reload.js";
+import { ClusterCache } from "./cluster-cache.js";
+
+export function createAdminInterface(app: Miqro): EditorAdminInterface {
+  const adminCache = new ClusterCache("EditorCache[" + app.options.name + "]");
+  return {
+    getCache: () => adminCache,
+    stop: () => app.stop(),
+    restart: () => app.restart(),
+    reload: () => app.reload(),
+    getHotReloadHTML: getHotReloadScript,
+    getMigrations: () => {
+      if (app.inflated) {
+        const ret: MigrationModule[] = [];
+        for (const db of app.inflated.dbList) {
+          for (const m of db.migrations) {
+            ret.push(m);
+          }
+        }
+        return ret;
+      }
+      return [];
+    },
+    getServices: () => {
+      return app.options.services;
+    },
+    getRouteFileMap: () => {
+      return app.inflated ? app.inflated.fileMap : {};
+    },
+    getInflateErrors: () => {
+      return app.inflated ? app.inflated.errors : [];
+    }
+  }
+}

package/src/services/utils/cluster-cache.ts

@@ -79,12 +79,17 @@ export class ClusterCache implements CacheInterface {
         this.logger?.error(e);
       }
     };
+    this.connect();
+  }
+
+  connect() {
     if (process.send) {
+      process.removeListener("message", this.listener);
       process.on("message", this.listener);
     }
   }
 
-  dispose() {
+  disconnect() {
     process.removeListener("message", this.listener);
   }
 

package/src/services/utils/cluster-ws.ts

@@ -135,7 +135,12 @@ export class ClusterWebSocketServer2 extends WebSocketServer {
       }
     };
 
+    this.connect();
+  }
+
+  public connect() {
     if (process.send) {
+      process.removeListener("message", this.listener);
       process.on("message", this.listener);
       process.send({
         type: ClusterWebSocketServer2MessageType,
@@ -146,7 +151,7 @@ export class ClusterWebSocketServer2 extends WebSocketServer {
     }
   }
 
-  dispose() {
+  public dispose() {
     process.removeListener("message", this.listener);
   }
 

package/src/services/utils/db-manager.ts

@@ -47,6 +47,19 @@ export class DBManager {
     }
   }
 
+  async connectAll() {
+    this.options?.logger?.debug("connection all db connections");
+    const tR = [];
+    for (const name of this.map.keys()) {
+      const db = this.map.get(name);
+      if (db && db.status === "disconnected") {
+        this.options?.logger?.debug("connecting db connection [%s]", name);
+        tR.push(db.connect());
+      }
+    }
+    await Promise.all(tR);
+  }
+
   async closeAll() {
     this.options?.logger?.debug("closing all db connections");
     for (const name of this.map.keys()) {

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/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"
-  }
-}