miqro 6.0.9 → 6.0.11

package/sea/version.tag.js

@@ -0,0 +1,11 @@
+import { readFileSync, writeFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from 'node:url';
+
+export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url))) : null;
+
+const version = JSON.parse(readFileSync(resolve(__package_dirname, "../package.json")).toString()).version;
+
+console.log("writing [%s] with [%s]", resolve(__package_dirname, "version.tag"), version);
+
+writeFileSync(resolve(__package_dirname, "version.tag"), version);

package/src/common/arguments.ts

@@ -1,5 +1,5 @@
 import { checkEnvVariable } from "@miqro/core";
-import { existsSync, statSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 import { cwd, env, platform, arch } from "node:process";
 
@@ -10,7 +10,7 @@ import { BIN_NAME, help, usage } from "./help.js";
 import { TEST_SOCKET } from "./paths.js";
 import { isSea } from "node:sea";
 import cluster from "node:cluster";
-import { getVersion } from "./assets.js";
+import { __package_dirname, getVersion } from "./assets.js";
 
 export function getPORT() {
   return checkEnvVariable("PORT", "8080");
@@ -84,8 +84,12 @@ export function parseArguments(): Arguments {
           console.log("version [%s]", VERSION);
           console.log("Node.js version [%s]", NODE_VERSION);
           console.log("esbuild version [%s]", ESBUILD_VERSION);
+          console.log("platform [%s-%s]", platform, arch);
+        } else {
+          const packageJSON = JSON.parse(readFileSync(resolve(__package_dirname, "package.json")).toString());
+          const VERSION = packageJSON.version;
+          console.log("version [%s]", VERSION);
         }
-        console.log("platform [%s-%s]", platform, arch);
         process.exit(EXIT_CODES.NORMAL_EXIT);
       case "-h":
       case "--help":
@@ -319,22 +323,22 @@ export function parseArguments(): Arguments {
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.test && (flags.editor)) {
+  if (flags.test && (flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
     console.error("bad arguments. cannot use --editor with --test");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateUp && (flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+  if (flags.migrateUp && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-up");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateDown && (flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+  if (flags.migrateDown && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-down");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.generateDoc && (flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+  if (flags.generateDoc && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
     console.error("bad arguments. cannot use with --generate-doc");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }

package/src/common/assets.ts

@@ -10,7 +10,7 @@ import { initESBuild } from "./esbuild.js";
 import { initJSXJS } from "./jsx.js";
 //const require = createRequire(import.meta.url);
 
-const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
+export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
 
 const ASSETS_ROUTER = {
   "lib.cjs": "build/lib.cjs",

package/src/common/jsx.ts

@@ -126,16 +126,6 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
   }
 }
 
-export async function importAPIRoute(inFile: string, logger?: Logger) {
-  const mod = (await importJSXFile(inFile, logger)).default;
-  const module = typeof mod === "function" ? { handler: mod } : parser.parse(mod, APIRouteSchema, basename(inFile));
-  if (module !== undefined) {
-    return module as APIRoute;
-  } else {
-    throw new Error(`error with module [${inFile}] undefined`);
-  }
-}
-
 export const APIOptionsSchema: Schema<APIOptions> = {
   type: "object?",
   properties: {
@@ -155,7 +145,8 @@ export const APIOptionsSchema: Schema<APIOptions> = {
       properties: SessionHandlerOptionsSchema.properties
     },
     ...RouteOptionsSchema.properties
-  }
+  },
+  //mode:"add_extra"
 };
 
 export interface HTMLModule {
@@ -170,7 +161,8 @@ export const HTMLModuleSchema: Schema<HTMLModule> = {
       type: "function|object"
     },
     apiOptions: APIOptionsSchema
-  }
+  },
+  //mode:"add_extra"
 }
 
 export type JSONModuleValue = string | object;
@@ -187,7 +179,8 @@ export const JSONModuleSchema: Schema<JSONModule> = {
       type: "function|object|string"
     },
     apiOptions: APIOptionsSchema
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const MigrationSchema: Schema<Migration> = {
@@ -195,7 +188,8 @@ export const MigrationSchema: Schema<Migration> = {
   properties: {
     up: "function",
     down: "function"
-  }
+  },
+  mode: "add_extra"
 }
 
 export const CORSOptionsSchema: Schema<CORSOptions> = {
@@ -205,7 +199,8 @@ export const CORSOptionsSchema: Schema<CORSOptions> = {
     validate: "function?",
     methods: "string?",
     preflightContinue: "boolean?"
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const WSConfigSchema: Schema<WSConfig> = {
@@ -218,7 +213,8 @@ export const WSConfigSchema: Schema<WSConfig> = {
     onConnection: "function?",
     onMessage: "function?",
     onDisconnect: "function?"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const DBConfigSchema: Schema<DBConfig> = {
@@ -229,7 +225,8 @@ export const DBConfigSchema: Schema<DBConfig> = {
     storage: "string?",
     dialect: "string?",
     name: "string"
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const ServerConfigSchema: Schema<ServerConfig> = {
@@ -240,7 +237,8 @@ export const ServerConfigSchema: Schema<ServerConfig> = {
     stop: "function?",
     start: "function?",
     load: "function?"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const LogConfigSchema: Schema<LogConfig> = {
@@ -253,17 +251,27 @@ export const LogConfigSchema: Schema<LogConfig> = {
     replaceConsoleTransport: "boolean?",
     replaceFileTransport: "boolean?",
     write: "function"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const AuthConfigSchema: Schema<AuthConfig> = {
   type: "object",
   properties: {
     ...SessionHandlerOptionsSchema.properties
-  }
+  },
+  //mode:"add_extra"
 }
 
-
+export async function importAPIRoute(inFile: string, logger?: Logger) {
+  const mod = (await importJSXFile(inFile, logger)).default;
+  const module = typeof mod === "function" ? { handler: mod } : parser.parse(mod, APIRouteSchema, basename(inFile));
+  if (module !== undefined) {
+    return module as APIRoute;
+  } else {
+    throw new Error(`error with module [${inFile}] undefined`);
+  }
+}
 
 export async function importMigrationModule(inFile: string, logger?: Logger) {
   const module = parser.parse((await importJSXFile(inFile, logger)).default, MigrationSchema, basename(inFile));
@@ -275,7 +283,9 @@ export async function importMigrationModule(inFile: string, logger?: Logger) {
 }
 
 export async function importHTMLModule(inFile: string, logger?: Logger) {
-  const module = parser.parse((await importJSXFile(inFile, logger)), HTMLModuleSchema, basename(inFile));
+  const module = (await importJSXFile(inFile, logger));
+  parser.parse(module.default, HTMLModuleSchema.properties.default, `${basename(inFile)}.default`);
+  parser.parse(module.apiOptions, APIOptionsSchema, `${basename(inFile)}.apiOptions`);
   if (module !== undefined) {
     return module;
   } else {
@@ -284,7 +294,9 @@ export async function importHTMLModule(inFile: string, logger?: Logger) {
 }
 
 export async function importJSONModule(inFile: string, logger?: Logger) {
-  const module = parser.parse((await importJSXFile(inFile, logger)), JSONModuleSchema, basename(inFile));
+  const module = (await importJSXFile(inFile, logger));
+  parser.parse(module.default, JSONModuleSchema.properties.default, `${basename(inFile)}.default`);
+  parser.parse(module.apiOptions, APIOptionsSchema, `${basename(inFile)}.apiOptions`);
   if (module !== undefined) {
     return module;
   } else {

package/src/common/watch.ts

@@ -77,4 +77,9 @@ export async function watchAndServer(app: Miqro) {
 
   watchLogger?.info("watching for changes on [%s]", app.options.services.join(","));
   reWatch();
+  return {
+    stopWatch: () => {
+      stopWatch();
+    }
+  };
 }

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()) {